don't pollute the global namespace, move bind and shared_ptr into the lyx scope.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34264 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/src/support/bind.h b/src/support/bind.h
index f00d1629b4a687ab346d117679d6b4b1e4b1cd5c..6d3d83e9ad6ca4a1720454263ebc1485f6e02cff 100644 (file)
--- a/src/support/bind.h
+++ b/src/support/bind.h
@@ -15,16 +15,24 @@
 #if defined(_MSC_VER) && (_MSC_VER >= 1600)
 
 #include <functional>
-using std::tr1::bind;
-using std::tr1::placeholders::_1;
-using std::tr1::placeholders::_2;
-using std::tr1::ref;
+
+namespace lyx
+{
+       using std::tr1::bind;
+       using std::tr1::placeholders::_1;
+       using std::tr1::placeholders::_2;
+       using std::tr1::ref;
+}
 
 #else
 
 #include "boost/bind.hpp"
-using boost::bind;
-using boost::ref;
+
+namespace lyx
+{
+       using boost::bind;
+       using boost::ref;
+}
 
 #endif
 

diff --git a/src/support/shared_ptr.h b/src/support/shared_ptr.h
index 6976a5b4c5483fd3be9248000bcb68a1d7d010e8..a671211a5cfb07413974a8b570c8e2a8ceeaf72c 100644 (file)
--- a/src/support/shared_ptr.h
+++ b/src/support/shared_ptr.h
@@ -15,12 +15,20 @@
 #if defined(_MSC_VER) && (_MSC_VER >= 1600)
 
 #include <memory>
-using std::tr1::shared_ptr;
+
+namespace lyx
+{
+       using std::tr1::shared_ptr;
+}
 
 #else
 
 #include <boost/shared_ptr.hpp>
-using boost::shared_ptr;
+
+namespace lyx
+{
+       using boost::shared_ptr;
+}
 
 #endif