From: Peter Kümmel <syntheticpp@gmx.net>
Date: Thu, 22 Apr 2010 11:19:49 +0000 (+0000)
Subject: at least compile with msvc10.
X-Git-Tag: 2.0.0~3370
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=87c6a4679ac3530be5e57535faedfbd4e2fee26f;p=lyx.git

at least compile with msvc10.

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

diff --git a/development/cmake/CMakeLists.txt b/development/cmake/CMakeLists.txt
index 575d6d380f..9b204b32dc 100644
--- a/development/cmake/CMakeLists.txt
+++ b/development/cmake/CMakeLists.txt
@@ -378,7 +378,7 @@ if(MSVC)
 		# add here warnings which should produce an error /weXXXX
 		set(MSVC_W_ERROR   "/we4101 /we4189")
 		# add here warnings which should be disabled /wdXXXX
-		set(MSVC_W_DISABLE "/wd4288 /wd4355 /wd4800 /wd4996 /wd4311 /wd4312 /wd4505 /wd4267 /wd4512 /wd4245 /wd4127 /wd4180")
+		set(MSVC_W_DISABLE "/wd4288 /wd4355 /wd4800 /wd4996 /wd4311 /wd4312 /wd4505 /wd4267 /wd4512 /wd4245 /wd4127 /wd4180 /wd4231")
 
 		set(CMAKE_CXX_FLAGS_DEBUG
 			"${CMAKE_CXX_FLAGS_DEBUG} /Wp64 ${MSVC_W_ERROR} ${MSVC_W_DISABLE}")
@@ -396,7 +396,7 @@ if(MSVC)
 		# add here warnings which should produce an error /weXXXX
 		set(MSVC_W_ERROR   "/we4101 /we4189")
 		# add here warnings which should be disabled /wdXXXX
-		set(MSVC_W_DISABLE "/wd4288 /wd4355 /wd4800 /wd4996 /wd4267 /wd4180")
+		set(MSVC_W_DISABLE "/wd4288 /wd4355 /wd4800 /wd4996 /wd4267 /wd4180 /wd4231")
 
 		set(CMAKE_CXX_FLAGS_DEBUG
 			"${CMAKE_CXX_FLAGS_DEBUG} ${MSVC_W_ERROR} ${MSVC_W_DISABLE}")
diff --git a/src/support/docstream.h b/src/support/docstream.h
index 8a60e55509..b4a4f80fb1 100644
--- a/src/support/docstream.h
+++ b/src/support/docstream.h
@@ -68,8 +68,9 @@ public:
 };
 
 
+#if defined(_MSC_VER) && (_MSC_VER >= 1600)
 extern template class std::numpunct<lyx::char_type>;
-extern template class std::basic_ofstream<char_type>;
+#endif
 
 /// UCS4 input stringstream
 typedef std::basic_istringstream<char_type> idocstringstream;