From bfe2a6656ca83af432f19480e4ae623c809be51c Mon Sep 17 00:00:00 2001
From: "Ralf W. Grosse-Kunstleve" <rwgk@yahoo.com>
Date: Mon, 22 Jul 2002 19:35:44 +0000
Subject: [PATCH] pickle_group renamed -> pickle_suite

[SVN r14565]
---
 include/boost/python/class.hpp                | 14 ++++++------
 .../boost/python/object/pickle_support.hpp    | 22 +++++++++----------
 test/pickle1.cpp                              |  4 ++--
 test/pickle2.cpp                              |  4 ++--
 test/pickle3.cpp                              |  4 ++--
 5 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/include/boost/python/class.hpp b/include/boost/python/class.hpp
index e8610cef..8491ba9c 100644
--- a/include/boost/python/class.hpp
+++ b/include/boost/python/class.hpp
@@ -197,15 +197,15 @@ class class_ : public objects::class_base
     self& setattr(char const* name, handle<> const&);
 
     // Pickle support
-    template <typename PickleGroupType>
-    self& def_pickle(PickleGroupType)
+    template <typename PickleSuiteType>
+    self& def_pickle(PickleSuiteType)
     {
-      detail::pickle_group_finalize<PickleGroupType>::register_(
+      detail::pickle_suite_finalize<PickleSuiteType>::register_(
         *this,
-        &PickleGroupType::getinitargs,
-        &PickleGroupType::getstate,
-        &PickleGroupType::setstate,
-        PickleGroupType::getstate_manages_dict());
+        &PickleSuiteType::getinitargs,
+        &PickleSuiteType::getstate,
+        &PickleSuiteType::setstate,
+        PickleSuiteType::getstate_manages_dict());
       return *this;
     }
 
diff --git a/include/boost/python/object/pickle_support.hpp b/include/boost/python/object/pickle_support.hpp
index 667b60e0..6b68c47a 100644
--- a/include/boost/python/object/pickle_support.hpp
+++ b/include/boost/python/object/pickle_support.hpp
@@ -16,17 +16,17 @@ handle<> make_instance_reduce_function();
 namespace error_messages {
 
   template <class T>
-  struct missing_pickle_group_function_or_incorrect_signature {};
+  struct missing_pickle_suite_function_or_incorrect_signature {};
 
 }
 
-namespace detail { struct pickle_group_registration; }
+namespace detail { struct pickle_suite_registration; }
 
-struct pickle_group
+struct pickle_suite
 {
   private:
     struct inaccessible {};
-    friend struct detail::pickle_group_registration;
+    friend struct detail::pickle_suite_registration;
   public:
     static inaccessible* getinitargs() { return 0; }
     static inaccessible* getstate() { return 0; }
@@ -36,9 +36,9 @@ struct pickle_group
 
 namespace detail {
 
-  struct pickle_group_registration
+  struct pickle_suite_registration
   {
-    typedef pickle_group::inaccessible inaccessible;
+    typedef pickle_suite::inaccessible inaccessible;
 
     template <class Class_, class Tgetinitargs>
     static
@@ -94,15 +94,15 @@ namespace detail {
       ...)
     {
       typedef typename
-        error_messages::missing_pickle_group_function_or_incorrect_signature<
+        error_messages::missing_pickle_suite_function_or_incorrect_signature<
           Class_>::error_type error_type;
     }
   };
 
-  template <typename UserPickleGroupType>
-  struct pickle_group_finalize
-  : UserPickleGroupType,
-    pickle_group_registration
+  template <typename PickleSuiteType>
+  struct pickle_suite_finalize
+  : PickleSuiteType,
+    pickle_suite_registration
   {};
 
 } // namespace detail
diff --git a/test/pickle1.cpp b/test/pickle1.cpp
index c2de26dd..cecb9c6a 100644
--- a/test/pickle1.cpp
+++ b/test/pickle1.cpp
@@ -32,7 +32,7 @@ namespace {
       std::string get_country() const { return country; }
   };
 
-  struct world_pickle_group : boost::python::pickle_group
+  struct world_pickle_suite : boost::python::pickle_suite
   {
     static
     boost::python::tuple
@@ -54,7 +54,7 @@ BOOST_PYTHON_MODULE_INIT(pickle1_ext)
     .add(class_<world>("world")
       .def_init(args<const std::string&>())
       .def("greet", &world::greet)
-      .def_pickle(world_pickle_group())
+      .def_pickle(world_pickle_suite())
     )
   ;
 }
diff --git a/test/pickle2.cpp b/test/pickle2.cpp
index 916f99cf..47d655c6 100644
--- a/test/pickle2.cpp
+++ b/test/pickle2.cpp
@@ -47,7 +47,7 @@ namespace { // Avoid cluttering the global namespace.
       int secret_number;
   };
 
-  struct world_pickle_group : boost::python::pickle_group
+  struct world_pickle_suite : boost::python::pickle_suite
   {
     static
     boost::python::tuple
@@ -95,7 +95,7 @@ BOOST_PYTHON_MODULE_INIT(pickle2_ext)
       .def("greet", &world::greet)
       .def("get_secret_number", &world::get_secret_number)
       .def("set_secret_number", &world::set_secret_number)
-      .def_pickle(world_pickle_group())
+      .def_pickle(world_pickle_suite())
     )
   ;
 }
diff --git a/test/pickle3.cpp b/test/pickle3.cpp
index b6d00a82..911eb7b8 100644
--- a/test/pickle3.cpp
+++ b/test/pickle3.cpp
@@ -43,7 +43,7 @@ namespace { // Avoid cluttering the global namespace.
       int secret_number;
   };
 
-  struct world_pickle_group : boost::python::pickle_group
+  struct world_pickle_suite : boost::python::pickle_suite
   {
     static
     boost::python::tuple
@@ -101,7 +101,7 @@ BOOST_PYTHON_MODULE_INIT(pickle3_ext)
       .def("greet", &world::greet)
       .def("get_secret_number", &world::get_secret_number)
       .def("set_secret_number", &world::set_secret_number)
-      .def_pickle(world_pickle_group())
+      .def_pickle(world_pickle_suite())
     )
   ;
 }