From d031cebdb6ac4558bee1085e61e1e4039c66db20 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ion=20Gazta=C3=B1aga?= <igaztanaga@gmail.com>
Date: Fri, 12 Mar 2010 13:22:13 +0000
Subject: [PATCH] Interprocess:  
 [@https://svn.boost.org/trac/boost/ticket/3439 #3439],  
 [@https://svn.boost.org/trac/boost/ticket/3846 #3846],  
 [@https://svn.boost.org/trac/boost/ticket/3947 #3947],  
 [@https://svn.boost.org/trac/boost/ticket/3985 #3985]. Intrusive:  
 [@https://svn.boost.org/trac/boost/ticket/3668 #3668],  
 [@https://svn.boost.org/trac/boost/ticket/3339 #3688],  
 [@https://svn.boost.org/trac/boost/ticket/3698 #3698],  
 [@https://svn.boost.org/trac/boost/ticket/3706 #3706],  
 [@https://svn.boost.org/trac/boost/ticket/3721 #3721].  
 [@https://svn.boost.org/trac/boost/ticket/3729 #3729],  
 [@https://svn.boost.org/trac/boost/ticket/3746 #3746],  
 [@https://svn.boost.org/trac/boost/ticket/3781 #3781],  
 [@https://svn.boost.org/trac/boost/ticket/3829 #3829],  
 [@https://svn.boost.org/trac/boost/ticket/3840 #3840],  
 [@https://svn.boost.org/trac/boost/ticket/3339 #3339],  
 [@https://svn.boost.org/trac/boost/ticket/3419 #3419],  
 [@https://svn.boost.org/trac/boost/ticket/3431 #3431],

[SVN r60515]
---
 test/common_functors.hpp | 2 +-
 test/set_test.cpp        | 1 +
 test/smart_ptr.hpp       | 4 ++--
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/test/common_functors.hpp b/test/common_functors.hpp
index ebfc846..7f7c675 100644
--- a/test/common_functors.hpp
+++ b/test/common_functors.hpp
@@ -29,7 +29,7 @@ class delete_disposer
    {
       typedef typename std::iterator_traits<Pointer>::value_type value_type;
       BOOST_INTRUSIVE_INVARIANT_ASSERT(( detail::is_same<T, value_type>::value ));
-      delete detail::get_pointer(p); 
+      delete detail::boost_intrusive_get_pointer(p); 
    }
 };
 
diff --git a/test/set_test.cpp b/test/set_test.cpp
index aa1ca2b..97210d8 100644
--- a/test/set_test.cpp
+++ b/test/set_test.cpp
@@ -147,6 +147,7 @@ class test_main_template<VoidPointer, false>
    }
 };
 
+
 int main( int, char* [] ) 
 {
    test_main_template<void*, false>()();
diff --git a/test/smart_ptr.hpp b/test/smart_ptr.hpp
index 24ac8bb..c5ccfc5 100644
--- a/test/smart_ptr.hpp
+++ b/test/smart_ptr.hpp
@@ -303,10 +303,10 @@ inline void swap (smart_ptr<T> &pt,
    pt2 = ptr;
 }
 
-//!detail::get_pointer() enables boost::mem_fn to recognize smart_ptr.
+//!detail::boost_intrusive_get_pointer() enables boost::mem_fn to recognize smart_ptr.
 //!Never throws.
 template<class T>
-inline T* get_pointer(const smart_ptr<T>  & p)
+inline T* boost_intrusive_get_pointer(const smart_ptr<T>  & p)
 {  return p.get();   }
 
 //!Simulation of static_cast between pointers. Never throws.