[Boost-commit] svn:boost r42919 - sandbox/pinhole/boost/pinhole

From: jmcintyre_at_[hidden]
Date: 2008-01-22 23:54:52

Author: jared
Date: 2008-01-22 23:54:51 EST (Tue, 22 Jan 2008)
New Revision: 42919
URL: http://svn.boost.org/trac/boost/changeset/42919

Log:
switch to TR1 namespace usage where possible
Text files modified: 
   sandbox/pinhole/boost/pinhole/action_info.hpp      |     6 +++---                                  
   sandbox/pinhole/boost/pinhole/property_group.hpp   |    14 +++++++-------                          
   sandbox/pinhole/boost/pinhole/property_info.hpp    |    12 ++++++------                            
   sandbox/pinhole/boost/pinhole/property_manager.hpp |     6 +++---                                  
   4 files changed, 19 insertions(+), 19 deletions(-)

Modified: sandbox/pinhole/boost/pinhole/action_info.hpp
==============================================================================
--- sandbox/pinhole/boost/pinhole/action_info.hpp	(original)
+++ sandbox/pinhole/boost/pinhole/action_info.hpp	2008-01-22 23:54:51 EST (Tue, 22 Jan 2008)
@@ -12,8 +12,8 @@
     #pragma warning(push)
     #pragma warning( disable: 4561 4793 )
 #endif
-#include <boost/type_traits.hpp>
-#include <boost/function.hpp>
+#include <boost/tr1/type_traits.hpp>
+#include <boost/tr1/functional.hpp>
 #include <boost/lexical_cast.hpp>
 #if defined(BOOST_MSVC)
     #pragma warning(pop)
@@ -27,7 +27,7 @@
         template<typename type> struct Internal;
 
     public:
-        typedef boost::function<void ()> action_type;
+        typedef std::tr1::function<void ()> action_type;
         
         virtual ~action_info(){;}
 

Modified: sandbox/pinhole/boost/pinhole/property_group.hpp
==============================================================================
--- sandbox/pinhole/boost/pinhole/property_group.hpp	(original)
+++ sandbox/pinhole/boost/pinhole/property_group.hpp	2008-01-22 23:54:51 EST (Tue, 22 Jan 2008)
@@ -20,10 +20,10 @@
     #pragma warning(push)
     #pragma warning( disable: 4561)
 #endif
-#include <boost/bind.hpp>
+#include <boost/tr1/memory.hpp>
+#include <boost/tr1/type_traits.hpp>
+#include <boost/tr1/functional.hpp>
 #include <boost/static_assert.hpp>
-#include <boost/type_traits.hpp>
-#include <boost/function.hpp>
 #include <boost/any.hpp>
 #if defined(BOOST_MSVC)
     #pragma warning(pop)
@@ -55,9 +55,9 @@
     };
 
     template<typename T>
-    inline boost::function<void (const T&)> property_system_var_setter_builder(T &t)
+    inline std::tr1::function<void (const T&)> property_system_var_setter_builder(T &t)
     {
-        return boost::bind<void>(property_system_var_setter<T>(t), _1);
+        return std::tr1::bind<void>(property_system_var_setter<T>(t), _1);
     }
 
     #define BOOST_SETTER_VAR(c) boost::pinhole::property_system_var_setter_builder(c)
@@ -78,9 +78,9 @@
     };
 
     template<typename T>
-    inline boost::function<T ()> property_system_var_getter_builder(T &t)
+    inline std::tr1::function<T ()> property_system_var_getter_builder(T &t)
     {
-        return boost::bind<T>(property_system_var_getter<T>(t));
+        return std::tr1::bind<T>(property_system_var_getter<T>(t));
     }
 
     #define BOOST_GETTER_VAR(c) boost::pinhole::property_system_var_getter_builder(c)

Modified: sandbox/pinhole/boost/pinhole/property_info.hpp
==============================================================================
--- sandbox/pinhole/boost/pinhole/property_info.hpp	(original)
+++ sandbox/pinhole/boost/pinhole/property_info.hpp	2008-01-22 23:54:51 EST (Tue, 22 Jan 2008)
@@ -12,8 +12,8 @@
     #pragma warning(push)
     #pragma warning( disable: 4561 4793 )
 #endif
-#include <boost/type_traits.hpp>
-#include <boost/function.hpp>
+#include <boost/tr1/type_traits.hpp>
+#include <boost/tr1/functional.hpp>
 #include <boost/lexical_cast.hpp>
 #include <boost/algorithm/string/predicate.hpp>
 #include <boost/format.hpp>
@@ -273,13 +273,13 @@
     private:
 
     public:
-        typedef typename boost::remove_reference<T>::type Value_Type;
-        typedef boost::function<void (const Value_Type&)> setter_type;
-        typedef boost::function<Value_Type ()> getter_type;
+        typedef typename std::tr1::remove_reference<T>::type Value_Type;
+        typedef std::tr1::function<void (const Value_Type&)> setter_type;
+        typedef std::tr1::function<Value_Type ()> getter_type;
 
         // The system does not allow you to use pointers as property
         // types due to the ambiguity of their use.
-        BOOST_STATIC_ASSERT(false == boost::is_pointer<Value_Type>::value);
+        BOOST_STATIC_ASSERT(false == std::tr1::is_pointer<Value_Type>::value);
 
         setter_type setter;
         getter_type getter;

Modified: sandbox/pinhole/boost/pinhole/property_manager.hpp
==============================================================================
--- sandbox/pinhole/boost/pinhole/property_manager.hpp	(original)
+++ sandbox/pinhole/boost/pinhole/property_manager.hpp	2008-01-22 23:54:51 EST (Tue, 22 Jan 2008)
@@ -17,7 +17,7 @@
     #pragma warning(push)
     #pragma warning( disable: 4561 4793 )
 #endif
-#include <boost/shared_ptr.hpp>
+#include <boost/tr1/memory.hpp>
 #include <boost/signals.hpp>
 #include <boost/algorithm/string.hpp>
 #if defined(BOOST_MSVC)
@@ -72,7 +72,7 @@
     class BOOST_PINHOLE_DECL property_manager
     {
     public:
-        typedef boost::shared_ptr<property_manager> instance_type;
+        typedef std::tr1::shared_ptr<property_manager> instance_type;
 
     private:
         static void deleter(property_manager* manager)
@@ -272,7 +272,7 @@
             #pragma warning(push)
             #pragma warning( disable: 4251 )
         #endif
-            static boost::shared_ptr<property_manager> m_instance;
+            static std::tr1::shared_ptr<property_manager> m_instance;
             category_to_property_group_map m_property_group_collection;
             category_collection m_category_collection;
         #if defined(BOOST_MSVC)