From: Adam Dickmeiss <adam@indexdata.dk>
Date: Thu, 30 Oct 2014 12:13:52 +0000 (+0100)
Subject: Update template filter to avoid Pimpl MP-579
X-Git-Tag: v1.7.1~3
X-Git-Url: http://git.indexdata.com/?a=commitdiff_plain;ds=sidebyside;h=74728b63c51be8dc60ba686c37244b2c468e263b;p=metaproxy-moved-to-github.git

Update template filter to avoid Pimpl MP-579
---

diff --git a/src/filter_template.cpp b/src/filter_template.cpp
index e654a24..3b26044 100644
--- a/src/filter_template.cpp
+++ b/src/filter_template.cpp
@@ -21,6 +21,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include <metaproxy/package.hpp>
 #include <metaproxy/util.hpp>
 
+#include <boost/scoped_ptr.hpp>
 #include <boost/thread/mutex.hpp>
 
 #include <yaz/zgdu.h>
@@ -30,10 +31,10 @@ namespace yf = mp::filter;
 
 namespace metaproxy_1 {
     namespace filter {
-        class Template::Impl {
+        class Template : public Base {
         public:
-            Impl();
-            ~Impl();
+            Template();
+            ~Template();
             void process(metaproxy_1::Package & package) const;
             void configure(const xmlNode * ptr, bool test_only,
                            const char *path);
@@ -43,49 +44,21 @@ namespace metaproxy_1 {
     }
 }
 
-// define Pimpl wrapper forwarding to Impl
-
-yf::Template::Template() : m_p(new Impl)
+yf::Template::Template()
 {
 }
 
 yf::Template::~Template()
-{  // must have a destructor because of boost::scoped_ptr
+{
 }
 
 void yf::Template::configure(const xmlNode *xmlnode, bool test_only,
                              const char *path)
 {
-    m_p->configure(xmlnode, test_only, path);
 }
 
 void yf::Template::process(mp::Package &package) const
 {
-    m_p->process(package);
-}
-
-
-// define Implementation stuff
-
-
-
-yf::Template::Impl::Impl()
-{
-    m_dummy = 1;
-}
-
-yf::Template::Impl::~Impl()
-{
-}
-
-void yf::Template::Impl::configure(const xmlNode *xmlnode, bool test_only,
-                                   const char *path)
-{
-}
-
-void yf::Template::Impl::process(mp::Package &package) const
-{
-    // Z_GDU *gdu = package.request().get();
     package.move();
 }
 
diff --git a/src/filter_template.hpp b/src/filter_template.hpp
index 37afb2b..6d86423 100644
--- a/src/filter_template.hpp
+++ b/src/filter_template.hpp
@@ -20,25 +20,8 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #ifndef FILTER_TEMPLATE_HPP
 #define FILTER_TEMPLATE_HPP
 
-#include <boost/scoped_ptr.hpp>
-
 #include <metaproxy/filter.hpp>
 
-namespace metaproxy_1 {
-    namespace filter {
-        class Template : public Base {
-            class Impl;
-            boost::scoped_ptr<Impl> m_p;
-        public:
-            Template();
-            ~Template();
-            void process(metaproxy_1::Package & package) const;
-            void configure(const xmlNode * ptr, bool test_only,
-                           const char *path);
-        };
-    }
-}
-
 extern "C" {
     extern struct metaproxy_1_filter_struct metaproxy_1_filter_template;
 }