X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fsupport%2Fshared_ptr.h;h=69e42da23c216a96732d2a57c52772fee520df2e;hb=ee9ff6cb0cd7d8b0ef3c18e5bd166e12580a3bf4;hp=a671211a5cfb07413974a8b570c8e2a8ceeaf72c;hpb=5b916eb7c512fb76187e230aa5127a834e5663fa;p=lyx.git

diff --git a/src/support/shared_ptr.h b/src/support/shared_ptr.h
index a671211a5c..69e42da23c 100644
--- a/src/support/shared_ptr.h
+++ b/src/support/shared_ptr.h
@@ -12,13 +12,18 @@
 #ifndef LYX_SHARED_PTR_H
 #define LYX_SHARED_PTR_H
 
-#if defined(_MSC_VER) && (_MSC_VER >= 1600)
+#ifdef LYX_USE_TR1
 
 #include <memory>
 
+#ifdef __GNUC__
+#include <tr1/memory>
+#endif
+
 namespace lyx
 {
 	using std::tr1::shared_ptr;
+	using std::tr1::const_pointer_cast;
 }
 
 #else
@@ -28,6 +33,7 @@ namespace lyx
 namespace lyx
 {
 	using boost::shared_ptr;
+	using boost::const_pointer_cast;
 }
 
 #endif