Le 20/09/2015 17:05, Uwe Stöhr a écrit :
I get 2 compilation errors with current master:

   ..\..\src\TocBackend.cpp(191): error C2668: 'boost::make_shared':
ambiguous call of an overloaded function
[D:\LyXGit\Master\compile-result\src\LyX.vcxproj]
   ..\..\src\TocBackend.cpp(191): error C2228: left of ".first" must be
a class/structure/union. [D:\LyXGit\Master\compile-result\src\LyX.vcxproj]

regards Uwe



Can you please test the attached patch and report if it fixes the compilation in c++98 mode? (with up-to-date master)


diff --git a/src/support/shared_ptr.h b/src/support/shared_ptr.h
index bb613de..0eb5646 100644
--- a/src/support/shared_ptr.h
+++ b/src/support/shared_ptr.h
@@ -12,7 +12,7 @@
 #ifndef LYX_SHARED_PTR_H
 #define LYX_SHARED_PTR_H
 
-#ifdef LYX_USE_CXX11
+#if defined(LYX_USE_CXX11) || (defined(_MSC_VER) && (_MSC_VER >= 1600))
 
 #include <memory>
 #define LYX_SHAREDPTR_NS std

Reply via email to