Author: tschoening
Date: Mon Feb 10 16:25:39 2014
New Revision: 1566676
URL: http://svn.apache.org/r1566676
Log:
LOGCXX-356:
apache-log4cxx-0.10.0\src\main\include\log4cxx\spi\configurator.h(57) : warning
C4231: nonstandard extension used : 'extern' before template explicit
instantiation
Modified:
incubator/log4cxx/trunk/src/changes/changes.xml
incubator/log4cxx/trunk/src/main/include/log4cxx/log4cxx.hw
Modified: incubator/log4cxx/trunk/src/changes/changes.xml
URL:
http://svn.apache.org/viewvc/incubator/log4cxx/trunk/src/changes/changes.xml?rev=1566676&r1=1566675&r2=1566676&view=diff
==============================================================================
--- incubator/log4cxx/trunk/src/changes/changes.xml (original)
+++ incubator/log4cxx/trunk/src/changes/changes.xml Mon Feb 10 16:25:39 2014
@@ -65,6 +65,7 @@
<action issue="LOGCXX-340"
type="fix">Transcoder::encodeCharsetName bungles encoding</action>
<action issue="LOGCXX-351" type="fix">Download page
does not have link to KEYS file</action>
<action issue="LOGCXX-353" type="fix">When a client
disconnects the SocketHubAppender crashes on the next log message</action>
+ <action issue="LOGCXX-356"
type="fix">apache-log4cxx-0.10.0\src\main\include\log4cxx\spi\configurator.h(57)
: warning C4231: nonstandard extension used : 'extern' before template
explicit instantiation</action>
<action issue="LOGCXX-358" type="fix">SMTPAppender
generating Emails with an empty body</action>
<action issue="LOGCXX-365" type="fix">Unit tests fail
on system dates later than 2009-12-31.</action>
<action issue="LOGCXX-366" type="fix">Errors when
compile log4cxx 0.10.0 under Win7 x64 with Visual Studio 2010 (due to Christian
Boos and Feng Nan)</action>
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=1566676&r1=1566675&r2=1566676&view=diff
==============================================================================
--- incubator/log4cxx/trunk/src/main/include/log4cxx/log4cxx.hw (original)
+++ incubator/log4cxx/trunk/src/main/include/log4cxx/log4cxx.hw Mon Feb 10
16:25:39 2014
@@ -79,13 +79,19 @@ typedef std::vector<T> N
// pointer and list definition macros when linking with DLL using VC
//
#elif defined(_MSC_VER) && !defined(LOG4CXX_STATIC)
-#define LOG4CXX_PTR_DEF(T) \
-extern template class LOG4CXX_EXPORT log4cxx::helpers::ObjectPtrT<T>; \
-typedef log4cxx::helpers::ObjectPtrT<T> T##Ptr
-#define LOG4CXX_LIST_DEF(N, T) \
-extern template class LOG4CXX_EXPORT std::allocator<T>; \
-extern template class LOG4CXX_EXPORT std::vector<T>; \
-typedef std::vector<T> N
+ #define LOG4CXX_PTR_DEF(T)
\
+ #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)
+ #define LOG4CXX_LIST_DEF(N, T)
\
+ #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)
//
// pointer and list definition macros for all other cases
//
