Add header for HasClassRegistry helper functions.

Move there the wrapper_registry_configurator class.

Author: pavoljuhas

srrealmodule/srreal_converters.hpp

@@ -406,50 +406,6 @@ class wrapper_srreal : public ::boost::python::wrapper<T>
         }
 };
 
-
-/// template class for handling Python Wrapper classes in C++ class registry
-template <class T>
-class wrapper_registry_configurator
-{
-        typedef typename T::SharedPtr TSharedPtr;
-        typedef typename T::SharedPtr::element_type* TPtr;
-
-    public:
-
-        // constructor
-        wrapper_registry_configurator() : mcptr(0), mpyptr(0)  { }
-
-        // methods
-        /// the fetch method should be called only from the wrapped method
-        /// create() to remember pointers to the last Python object and
-        /// the C++ instance that it wraps.
-        TSharedPtr fetch(::boost::python::object& obj) const
-        {
-            TSharedPtr p = ::boost::python::extract<TSharedPtr>(obj);
-            mcptr = p.get();
-            mpyptr = obj.ptr();
-            return p;
-        }
-
-        /// the setup function should be executed just once from the
-        /// HasClassRegistry::setupRegisteredObject method in the wrapper
-        /// class.  This ensures the Python object in a prototype factory
-        /// stays alive when the process is shut down.
-        void setup(TSharedPtr ptr) const
-        {
-            assert(mcptr && mcptr == ptr.get());
-            ::boost::python::incref(mpyptr);
-            mcptr = 0;
-            mpyptr = 0;
-        }
-
-    private:
-
-        // data
-        mutable TPtr mcptr;
-        mutable PyObject* mpyptr;
-};
-
 }   // namespace srrealmodule
 
 // Include shared wrapper definitions ----------------------------------------

srrealmodule/srreal_registry.hpp

@@ -0,0 +1,71 @@
+/*****************************************************************************
+*
+* diffpy.srreal     Complex Modeling Initiative
+*                   (c) 2016 Brookhaven Science Associates,
+*                   Brookhaven National Laboratory.
+*                   All rights reserved.
+*
+* File coded by:    Pavol Juhas
+*
+* See AUTHORS.txt for a list of people who contributed.
+* See LICENSE.txt for license information.
+*
+******************************************************************************
+*
+* Utilities for wrapping classes that derive from HasClassRegistry.
+*
+*****************************************************************************/
+
+#ifndef SRREAL_REGISTRY_HPP_INCLUDED
+#define SRREAL_REGISTRY_HPP_INCLUDED
+
+#include <boost/python/object.hpp>
+
+namespace srrealmodule {
+
+/// template class for handling Python Wrapper classes in C++ class registry
+template <class T>
+class wrapper_registry_configurator
+{
+        typedef typename T::SharedPtr TSharedPtr;
+        typedef typename T::SharedPtr::element_type* TPtr;
+
+    public:
+
+        // constructor
+        wrapper_registry_configurator() : mcptr(0), mpyptr(0)  { }
+
+        // methods
+        /// the fetch method should be called only from the wrapped method
+        /// create() to remember pointers to the last Python object and
+        /// the C++ instance that it wraps.
+        TSharedPtr fetch(::boost::python::object& obj) const
+        {
+            TSharedPtr p = ::boost::python::extract<TSharedPtr>(obj);
+            mcptr = p.get();
+            mpyptr = obj.ptr();
+            return p;
+        }
+
+        /// the setup function should be executed just once from the
+        /// HasClassRegistry::setupRegisteredObject method in the wrapper
+        /// class.  This ensures the Python object in a prototype factory
+        /// stays alive when the process is shut down.
+        void setup(TSharedPtr ptr) const
+        {
+            assert(mcptr && mcptr == ptr.get());
+            ::boost::python::incref(mpyptr);
+            mcptr = 0;
+            mpyptr = 0;
+        }
+
+    private:
+
+        // data
+        mutable TPtr mcptr;
+        mutable PyObject* mpyptr;
+};
+
+}   // namespace srrealmodule
+
+#endif  // SRREAL_REGISTRY_HPP_INCLUDED

srrealmodule/wrap_AtomRadiiTable.cpp

@@ -23,6 +23,7 @@
 
 #include "srreal_converters.hpp"
 #include "srreal_pickling.hpp"
+#include "srreal_registry.hpp"
 
 #include <diffpy/srreal/AtomRadiiTable.hpp>
 #include <diffpy/srreal/ConstantRadiiTable.hpp>

srrealmodule/wrap_PDFBaseline.cpp

@@ -35,6 +35,7 @@
 
 #include "srreal_converters.hpp"
 #include "srreal_pickling.hpp"
+#include "srreal_registry.hpp"
 
 namespace srrealmodule {
 namespace nswrap_PDFBaseline {

srrealmodule/wrap_PDFEnvelope.cpp

@@ -37,6 +37,7 @@
 
 #include "srreal_converters.hpp"
 #include "srreal_pickling.hpp"
+#include "srreal_registry.hpp"
 
 namespace srrealmodule {
 namespace nswrap_PDFEnvelope {

srrealmodule/wrap_PeakProfile.cpp

@@ -30,6 +30,7 @@
 
 #include "srreal_converters.hpp"
 #include "srreal_pickling.hpp"
+#include "srreal_registry.hpp"
 
 namespace srrealmodule {
 namespace nswrap_PeakProfile {

srrealmodule/wrap_PeakWidthModel.cpp

@@ -31,6 +31,7 @@
 #include <diffpy/serialization.hpp>
 
 #include "srreal_converters.hpp"
+#include "srreal_registry.hpp"
 
 namespace srrealmodule {
 namespace nswrap_PeakWidthModel {

srrealmodule/wrap_ScatteringFactorTable.cpp

@@ -37,6 +37,7 @@
 
 #include "srreal_converters.hpp"
 #include "srreal_pickling.hpp"
+#include "srreal_registry.hpp"
 
 namespace srrealmodule {
 namespace nswrap_ScatteringFactorTable {