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

From: jmcintyre_at_[hidden]
Date: 2007-12-03 15:54:23

Author: jared
Date: 2007-12-03 15:54:23 EST (Mon, 03 Dec 2007)
New Revision: 41664
URL: http://svn.boost.org/trac/boost/changeset/41664

Log:
Fix build warning on Visual Studio and errors when only including certain header files.
Text files modified: 
   sandbox/pinhole/boost/pinhole/map_key_value_iterators.h |     1 +                                       
   sandbox/pinhole/boost/pinhole/property_group.h          |     8 ++++----                                
   sandbox/pinhole/boost/pinhole/property_manager.h        |    18 ++++++++++--------                      
   3 files changed, 15 insertions(+), 12 deletions(-)

Modified: sandbox/pinhole/boost/pinhole/map_key_value_iterators.h
==============================================================================
--- sandbox/pinhole/boost/pinhole/map_key_value_iterators.h	(original)
+++ sandbox/pinhole/boost/pinhole/map_key_value_iterators.h	2007-12-03 15:54:23 EST (Mon, 03 Dec 2007)
@@ -8,6 +8,7 @@
 #ifndef BOOST_MAP_KEY_VALUE_ITERATORS
 #define BOOST_MAP_KEY_VALUE_ITERATORS
 
+#include <boost/config.hpp>
 #if defined(BOOST_MSVC)
     #pragma warning(push)
     #pragma warning(disable: 4561 4996)

Modified: sandbox/pinhole/boost/pinhole/property_group.h
==============================================================================
--- sandbox/pinhole/boost/pinhole/property_group.h	(original)
+++ sandbox/pinhole/boost/pinhole/property_group.h	2007-12-03 15:54:23 EST (Mon, 03 Dec 2007)
@@ -31,7 +31,7 @@
 #endif
 
 #define BOOST_SETTER(c) boost::bind(c, this, _1)
-#if defined(BOOST_MSVC) && (_MSC_VER > 1310)
+#if defined(BOOST_MSVC) && (_MSC_VER > 1310) && (_MSC_VER <= 1400)
     #define BOOST_GETTER(c) boost::bind(boost::mem_fn(c), this)
 #else
     #define BOOST_GETTER(c) boost::bind(c, this)
@@ -84,13 +84,13 @@
         return boost::bind<T>(property_system_var_getter<T>(t));
     }
 
-    #define BOOST_GETTER_VAR(c) property_system_var_getter_builder(c)
+    #define BOOST_GETTER_VAR(c) boost::pinhole::property_system_var_getter_builder(c)
 
     struct no_setter_struct {};
     struct no_getter_struct {};
     
-    #define BOOST_SETTER_NONE no_setter_struct()
-    #define BOOST_GETTER_NONE no_getter_struct()
+    #define BOOST_SETTER_NONE boost::pinhole::no_setter_struct()
+    #define BOOST_GETTER_NONE boost::pinhole::no_getter_struct()
 
     class property_group;
 

Modified: sandbox/pinhole/boost/pinhole/property_manager.h
==============================================================================
--- sandbox/pinhole/boost/pinhole/property_manager.h	(original)
+++ sandbox/pinhole/boost/pinhole/property_manager.h	2007-12-03 15:54:23 EST (Mon, 03 Dec 2007)
@@ -9,9 +9,11 @@
 #define BOOST_PROPERTY_MANAGER
 
 #include "exceptions.h"
+#include "map_key_value_iterators.h"
 #include <set>
 #include <string>
 
+#include <boost/config.hpp>
 #if defined(BOOST_MSVC)
     #pragma warning(push)
     #pragma warning( disable: 4561 4793 )
@@ -77,7 +79,7 @@
         }
         
     public:
-        typedef multimap<string, property_group*> category_to_property_group_map;
+        typedef std::multimap<std::string, property_group*> category_to_property_group_map;
         typedef map_value_iterator<category_to_property_group_map::iterator> iterator;
         typedef map_value_iterator<category_to_property_group_map::const_iterator> const_iterator;
         
@@ -167,7 +169,7 @@
         /**
          * Retrieves an iterator pointing to the first property group for a specified category.
          */
-        iterator begin(const string& strCategory)
+        iterator begin(const std::string& strCategory)
         {
             return iterator( m_property_group_collection.lower_bound(strCategory) );
         }
@@ -175,7 +177,7 @@
         /**
          * Retrieves an iterator pointing to the first property group for a specified category.
          */
-        const_iterator begin(const string& strCategory) const
+        const_iterator begin(const std::string& strCategory) const
         {
             return const_iterator( m_property_group_collection.lower_bound(strCategory) );
         }
@@ -183,7 +185,7 @@
         /**
          * Retrieves an iterator pointing to the end of the root property list for a specified category.
          */
-        iterator end(const string& strCategory)
+        iterator end(const std::string& strCategory)
         {
             return iterator( m_property_group_collection.upper_bound(strCategory) );
         }
@@ -191,7 +193,7 @@
         /**
          * Retrieves an iterator pointing to the end of the root property list for a specified category.
          */
-        const_iterator end(const string& strCategory) const
+        const_iterator end(const std::string& strCategory) const
         {
             return  const_iterator( m_property_group_collection.upper_bound(strCategory) );
         }
@@ -199,7 +201,7 @@
         /**
          * Retrieves the number of property groups for a specified category.
          */
-        size_t count(const string& strCategory) const
+        size_t count(const std::string& strCategory) const
         {
             return m_property_group_collection.count(strCategory);
         }
@@ -240,13 +242,13 @@
         /**
          * Adds a new category for the property group.
          */
-        virtual void add_category( const string &category_name, property_group *group )
+        virtual void add_category( const std::string &category_name, property_group *group )
         {
             m_category_collection.insert( category_name );
             m_property_group_collection.insert( make_pair( category_name, group ) );
         }
         
-        virtual void remove_category( const string &category_name, property_group *group )
+        virtual void remove_category( const std::string &category_name, property_group *group )
         {
             category_to_property_group_map::iterator pgItr;
             for ( pgItr = m_property_group_collection.find( category_name );