Fix bugs #6078 and #9364

[lyx.git] / src / support / shared_ptr.h

diff --git a/src/support/shared_ptr.h b/src/support/shared_ptr.h
index 874a6cde91d0b874d20b50bb4672c44e6fe19d42..bb613de5639f7cf96a0408c05ba75ffd52275fc3 100644 (file)
--- a/src/support/shared_ptr.h
+++ b/src/support/shared_ptr.h
@@ -12,17 +12,7 @@
 #ifndef LYX_SHARED_PTR_H
 #define LYX_SHARED_PTR_H
 
-#ifdef LYX_USE_TR1
-
-#include <memory>
-
-#ifdef __GNUC__
-#include <tr1/memory>
-#endif
-
-#define LYX_SHAREDPTR_NS std::tr1
-
-#elif __cplusplus >= 201103L
+#ifdef LYX_USE_CXX11
 
 #include <memory>
 #define LYX_SHAREDPTR_NS std
@@ -30,6 +20,7 @@
 #else
 
 #include <boost/shared_ptr.hpp>
+#include <boost/make_shared.hpp>
 #define LYX_SHAREDPTR_NS boost
 
 #endif
@@ -37,6 +28,7 @@
 namespace lyx
 {
        using LYX_SHAREDPTR_NS::shared_ptr;
+       using LYX_SHAREDPTR_NS::make_shared;
        using LYX_SHAREDPTR_NS::const_pointer_cast;
 }