Author: tschoening
Date: Fri Feb 14 18:07:31 2014
New Revision: 1568413
URL: http://svn.apache.org/r1568413
Log:
LOGCXX-356: fixed Compiler Error C2162
Modified:
incubator/log4cxx/trunk/src/main/include/log4cxx/log4cxx.hw
Modified: incubator/log4cxx/trunk/src/main/include/log4cxx/log4cxx.hw
URL:
http://svn.apache.org/viewvc/incubator/log4cxx/trunk/src/main/include/log4cxx/log4cxx.hw?rev=1568413&r1=1568412&r2=1568413&view=diff
==============================================================================
--- incubator/log4cxx/trunk/src/main/include/log4cxx/log4cxx.hw (original)
+++ incubator/log4cxx/trunk/src/main/include/log4cxx/log4cxx.hw Fri Feb 14
18:07:31 2014
@@ -80,18 +80,18 @@ typedef std::vector<T> N
//
#elif defined(_MSC_VER) && !defined(LOG4CXX_STATIC)
#define LOG4CXX_PTR_DEF(T)
\
- #pragma warning ( push )
\
- #pragma warning ( disable: 4231 )
\
+ __pragma(warning(push))
\
+ __pragma(warning(disable: 4231))
\
extern template class LOG4CXX_EXPORT
log4cxx::helpers::ObjectPtrT<T>; \
typedef log4cxx::helpers::ObjectPtrT<T> T##Ptr
\
- #pragma warning (pop)
+ __pragma(warning(pop))
#define LOG4CXX_LIST_DEF(N, T)
\
- #pragma warning ( push )
\
- #pragma warning ( disable: 4231 )
\
+ __pragma(warning(push))
\
+ __pragma(warning(disable: 4231))
\
extern template class LOG4CXX_EXPORT std::allocator<T>; \
extern template class LOG4CXX_EXPORT std::vector<T>; \
typedef std::vector<T> N
\
- #pragma warning (pop)
+ __pragma(warning(pop))
//
// pointer and list definition macros for all other cases
//
