Author: af
Date: Wed Mar 5 13:52:22 2014
New Revision: 1574487
URL: http://svn.apache.org/r1574487
Log:
124361: Avoid MSVC warning 4555 while including list.
Modified:
openoffice/trunk/main/stlport/systemstl/list
Modified: openoffice/trunk/main/stlport/systemstl/list
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/stlport/systemstl/list?rev=1574487&r1=1574486&r2=1574487&view=diff
==============================================================================
--- openoffice/trunk/main/stlport/systemstl/list (original)
+++ openoffice/trunk/main/stlport/systemstl/list Wed Mar 5 13:52:22 2014
@@ -23,16 +23,17 @@
#define SYSTEM_STL_LIST
#ifdef HAVE_STL_INCLUDE_PATH
- // TODO: use computed include file name
- #include_next <list>
+ // TODO: use computed include file name
+ #include_next <list>
#elif defined(_MSC_VER)
- #include <../../VC/include/list>
- // MSVC's list would cause a lot of expression-result-unused warnings
- // unless it is compiled in iterator-debugging mode. Silence this noise
- #pragma warning(disable:4555)
+ // MSVC's list would cause a lot of expression-result-unused warnings
+ // unless it is compiled in iterator-debugging mode. Silence this noise
temporarily.
+ #pragma warning(push)
+ #pragma warning(disable:4555)
+ #include <../../VC/include/list>
+ #pragma warning(pop)
#else // fall back to boost/tr1
- #include <boost/tr1/tr1/list>
+ #include <boost/tr1/tr1/list>
#endif
#endif
-
