Author: carnold
Date: Wed Feb 13 00:12:20 2008
New Revision: 627302
URL: http://svn.apache.org/viewvc?rev=627302&view=rev
Log:
LOGCXX-219: Reduce spurious warnings when using VC 2008
Modified:
logging/log4cxx/trunk/src/main/include/log4cxx/appender.h
logging/log4cxx/trunk/src/main/include/log4cxx/appenderskeleton.h
logging/log4cxx/trunk/src/main/include/log4cxx/asyncappender.h
logging/log4cxx/trunk/src/main/include/log4cxx/dailyrollingfileappender.h
logging/log4cxx/trunk/src/main/include/log4cxx/db/odbcappender.h
logging/log4cxx/trunk/src/main/include/log4cxx/filter/andfilter.h
logging/log4cxx/trunk/src/main/include/log4cxx/filter/denyallfilter.h
logging/log4cxx/trunk/src/main/include/log4cxx/filter/expressionfilter.h
logging/log4cxx/trunk/src/main/include/log4cxx/filter/levelmatchfilter.h
logging/log4cxx/trunk/src/main/include/log4cxx/filter/propertyfilter.h
logging/log4cxx/trunk/src/main/include/log4cxx/helpers/appenderattachableimpl.h
logging/log4cxx/trunk/src/main/include/log4cxx/helpers/bytearrayinputstream.h
logging/log4cxx/trunk/src/main/include/log4cxx/helpers/bytearrayoutputstream.h
logging/log4cxx/trunk/src/main/include/log4cxx/helpers/class.h
logging/log4cxx/trunk/src/main/include/log4cxx/helpers/inetaddress.h
logging/log4cxx/trunk/src/main/include/log4cxx/helpers/properties.h
logging/log4cxx/trunk/src/main/include/log4cxx/helpers/simpledateformat.h
logging/log4cxx/trunk/src/main/include/log4cxx/helpers/socketoutputstream.h
logging/log4cxx/trunk/src/main/include/log4cxx/helpers/transcoder.h
logging/log4cxx/trunk/src/main/include/log4cxx/helpers/xml.h
logging/log4cxx/trunk/src/main/include/log4cxx/hierarchy.h
logging/log4cxx/trunk/src/main/include/log4cxx/htmllayout.h
logging/log4cxx/trunk/src/main/include/log4cxx/layout.h
logging/log4cxx/trunk/src/main/include/log4cxx/logger.h
logging/log4cxx/trunk/src/main/include/log4cxx/logstring.h
logging/log4cxx/trunk/src/main/include/log4cxx/mdc.h
logging/log4cxx/trunk/src/main/include/log4cxx/ndc.h
logging/log4cxx/trunk/src/main/include/log4cxx/net/sockethubappender.h
logging/log4cxx/trunk/src/main/include/log4cxx/net/telnetappender.h
logging/log4cxx/trunk/src/main/include/log4cxx/pattern/patternconverter.h
logging/log4cxx/trunk/src/main/include/log4cxx/pattern/patternparser.h
logging/log4cxx/trunk/src/main/include/log4cxx/patternlayout.h
logging/log4cxx/trunk/src/main/include/log4cxx/propertyconfigurator.h
logging/log4cxx/trunk/src/main/include/log4cxx/rolling/gzcompressaction.h
logging/log4cxx/trunk/src/main/include/log4cxx/rolling/rollingpolicybase.h
logging/log4cxx/trunk/src/main/include/log4cxx/rolling/zipcompressaction.h
logging/log4cxx/trunk/src/main/include/log4cxx/rollingfileappender.h
logging/log4cxx/trunk/src/main/include/log4cxx/simplelayout.h
logging/log4cxx/trunk/src/main/include/log4cxx/spi/appenderattachable.h
logging/log4cxx/trunk/src/main/include/log4cxx/spi/errorhandler.h
logging/log4cxx/trunk/src/main/include/log4cxx/spi/hierarchyeventlistener.h
logging/log4cxx/trunk/src/main/include/log4cxx/spi/loggerrepository.h
logging/log4cxx/trunk/src/main/include/log4cxx/spi/loggingevent.h
logging/log4cxx/trunk/src/main/include/log4cxx/ttcclayout.h
logging/log4cxx/trunk/src/main/include/log4cxx/writerappender.h
logging/log4cxx/trunk/src/main/include/log4cxx/xml/domconfigurator.h
logging/log4cxx/trunk/src/test/cpp/logunit.cpp
logging/log4cxx/trunk/src/test/cpp/logunit.h
logging/log4cxx/trunk/src/test/cpp/util/filter.h
Modified: logging/log4cxx/trunk/src/main/include/log4cxx/appender.h
URL:
http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/main/include/log4cxx/appender.h?rev=627302&r1=627301&r2=627302&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/main/include/log4cxx/appender.h (original)
+++ logging/log4cxx/trunk/src/main/include/log4cxx/appender.h Wed Feb 13
00:12:20 2008
@@ -20,7 +20,7 @@
#if defined(_MSC_VER)
#pragma warning ( push )
-#pragma warning ( disable: 4786 4231 )
+#pragma warning ( disable: 4231 4251 4275 4786 )
#endif
Modified: logging/log4cxx/trunk/src/main/include/log4cxx/appenderskeleton.h
URL:
http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/main/include/log4cxx/appenderskeleton.h?rev=627302&r1=627301&r2=627302&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/main/include/log4cxx/appenderskeleton.h (original)
+++ logging/log4cxx/trunk/src/main/include/log4cxx/appenderskeleton.h Wed Feb
13 00:12:20 2008
@@ -18,6 +18,12 @@
#ifndef _LOG4CXX_APPENDER_SKELETON_H
#define _LOG4CXX_APPENDER_SKELETON_H
+#if defined(_MSC_VER)
+#pragma warning ( push )
+#pragma warning ( disable: 4231 4251 4275 4786 )
+#endif
+
+
#include <log4cxx/appender.h>
#include <log4cxx/layout.h>
#include <log4cxx/spi/errorhandler.h>
@@ -198,5 +204,10 @@
}; // class AppenderSkeleton
} // namespace log4cxx
+
+#if defined(_MSC_VER)
+#pragma warning ( pop )
+#endif
+
#endif //_LOG4CXX_APPENDER_SKELETON_H
Modified: logging/log4cxx/trunk/src/main/include/log4cxx/asyncappender.h
URL:
http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/main/include/log4cxx/asyncappender.h?rev=627302&r1=627301&r2=627302&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/main/include/log4cxx/asyncappender.h (original)
+++ logging/log4cxx/trunk/src/main/include/log4cxx/asyncappender.h Wed Feb 13
00:12:20 2008
@@ -20,7 +20,7 @@
#if defined(_MSC_VER)
#pragma warning ( push )
-#pragma warning ( disable: 4786 4231 )
+#pragma warning ( disable: 4231 4251 4275 4786 )
#endif
Modified:
logging/log4cxx/trunk/src/main/include/log4cxx/dailyrollingfileappender.h
URL:
http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/main/include/log4cxx/dailyrollingfileappender.h?rev=627302&r1=627301&r2=627302&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/main/include/log4cxx/dailyrollingfileappender.h
(original)
+++ logging/log4cxx/trunk/src/main/include/log4cxx/dailyrollingfileappender.h
Wed Feb 13 00:12:20 2008
@@ -18,6 +18,12 @@
#ifndef _LOG4CXX_DAILYROLLINGFILEAPPENDER_H
#define _LOG4CXX_DAILYROLLINGFILEAPPENDER_H
+#if defined(_MSC_VER)
+#pragma warning ( push )
+#pragma warning ( disable: 4231 4251 4275 4786 )
+#endif
+
+
#include <log4cxx/appender.h>
#include <log4cxx/fileappender.h>
#include <log4cxx/spi/optionhandler.h>
@@ -278,5 +284,10 @@
LOG4CXX_PTR_DEF(DailyRollingFileAppender)
}
+
+#if defined(_MSC_VER)
+#pragma warning ( pop )
+#endif
+
#endif
Modified: logging/log4cxx/trunk/src/main/include/log4cxx/db/odbcappender.h
URL:
http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/main/include/log4cxx/db/odbcappender.h?rev=627302&r1=627301&r2=627302&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/main/include/log4cxx/db/odbcappender.h (original)
+++ logging/log4cxx/trunk/src/main/include/log4cxx/db/odbcappender.h Wed Feb 13
00:12:20 2008
@@ -17,6 +17,13 @@
#ifndef _LOG4CXX_DB_ODBC_APPENDER_H
#define _LOG4CXX_DB_ODBC_APPENDER_H
+
+#if defined(_MSC_VER)
+#pragma warning ( push )
+#pragma warning ( disable: 4231 4251 4275 4786 )
+#endif
+
+
#include <log4cxx/log4cxx.h>
#include <log4cxx/helpers/exception.h>
@@ -278,5 +285,9 @@
} // namespace db
} // namespace log4cxx
+
+#if defined(_MSC_VER)
+#pragma warning ( pop )
+#endif
#endif // _LOG4CXX_DB_ODBC_APPENDER_H
Modified: logging/log4cxx/trunk/src/main/include/log4cxx/filter/andfilter.h
URL:
http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/main/include/log4cxx/filter/andfilter.h?rev=627302&r1=627301&r2=627302&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/main/include/log4cxx/filter/andfilter.h (original)
+++ logging/log4cxx/trunk/src/main/include/log4cxx/filter/andfilter.h Wed Feb
13 00:12:20 2008
@@ -18,6 +18,12 @@
#ifndef _LOG4CXX_FILTER_ANDFILTER_H
#define _LOG4CXX_FILTER_ANDFILTER_H
+#if defined(_MSC_VER)
+#pragma warning ( push )
+#pragma warning ( disable: 4231 4251 4275 4786 )
+#endif
+
+
#include <log4cxx/spi/filter.h>
namespace log4cxx
@@ -104,4 +110,9 @@
}
}
+
+#if defined(_MSC_VER)
+#pragma warning ( pop )
+#endif
+
#endif
Modified: logging/log4cxx/trunk/src/main/include/log4cxx/filter/denyallfilter.h
URL:
http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/main/include/log4cxx/filter/denyallfilter.h?rev=627302&r1=627301&r2=627302&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/main/include/log4cxx/filter/denyallfilter.h
(original)
+++ logging/log4cxx/trunk/src/main/include/log4cxx/filter/denyallfilter.h Wed
Feb 13 00:12:20 2008
@@ -18,6 +18,12 @@
#ifndef _LOG4CXX_FILTER_DENY_ALL_FILTER_H
#define _LOG4CXX_FILTER_DENY_ALL_FILTER_H
+#if defined(_MSC_VER)
+#pragma warning ( push )
+#pragma warning ( disable: 4231 4251 4275 4786 )
+#endif
+
+
#include <log4cxx/spi/filter.h>
namespace log4cxx
@@ -58,5 +64,10 @@
LOG4CXX_PTR_DEF(DenyAllFilter);
} // namespace filter
} // namespace log4cxx
+
+#if defined(_MSC_VER)
+#pragma warning ( pop )
+#endif
+
#endif // _LOG4CXX_FILTER_DENY_ALL_FILTER_H
Modified:
logging/log4cxx/trunk/src/main/include/log4cxx/filter/expressionfilter.h
URL:
http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/main/include/log4cxx/filter/expressionfilter.h?rev=627302&r1=627301&r2=627302&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/main/include/log4cxx/filter/expressionfilter.h
(original)
+++ logging/log4cxx/trunk/src/main/include/log4cxx/filter/expressionfilter.h
Wed Feb 13 00:12:20 2008
@@ -18,6 +18,12 @@
#ifndef _LOG4CXX_FILTER_EXPRESSIONFILTER_H
#define _LOG4CXX_FILTER_EXPRESSIONFILTER_H
+#if defined(_MSC_VER)
+#pragma warning ( push )
+#pragma warning ( disable: 4231 4251 4275 4786 )
+#endif
+
+
#include <log4cxx/spi/filter.h>
namespace log4cxx
@@ -115,5 +121,10 @@
};
}
}
+
+#if defined(_MSC_VER)
+#pragma warning ( pop )
+#endif
+
#endif
Modified:
logging/log4cxx/trunk/src/main/include/log4cxx/filter/levelmatchfilter.h
URL:
http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/main/include/log4cxx/filter/levelmatchfilter.h?rev=627302&r1=627301&r2=627302&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/main/include/log4cxx/filter/levelmatchfilter.h
(original)
+++ logging/log4cxx/trunk/src/main/include/log4cxx/filter/levelmatchfilter.h
Wed Feb 13 00:12:20 2008
@@ -18,6 +18,12 @@
#ifndef _LOG4CXX_FILTER_LEVEL_MATCH_FILTER_H
#define _LOG4CXX_FILTER_LEVEL_MATCH_FILTER_H
+#if defined(_MSC_VER)
+#pragma warning ( push )
+#pragma warning ( disable: 4231 4251 4275 4786 )
+#endif
+
+
#include <log4cxx/spi/filter.h>
#include <log4cxx/level.h>
@@ -88,5 +94,9 @@
LOG4CXX_PTR_DEF(LevelMatchFilter);
} // namespace filter
} // namespace log4cxx
+
+#if defined(_MSC_VER)
+#pragma warning ( pop )
+#endif
#endif // _LOG4CXX_FILTER_STRING_MATCH_FILTER_H
Modified: logging/log4cxx/trunk/src/main/include/log4cxx/filter/propertyfilter.h
URL:
http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/main/include/log4cxx/filter/propertyfilter.h?rev=627302&r1=627301&r2=627302&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/main/include/log4cxx/filter/propertyfilter.h
(original)
+++ logging/log4cxx/trunk/src/main/include/log4cxx/filter/propertyfilter.h Wed
Feb 13 00:12:20 2008
@@ -21,7 +21,7 @@
#if defined(_MSC_VER)
#pragma warning (push)
-#pragma warning (disable: 4786 4231)
+#pragma warning ( disable: 4231 4251 4275 4786 )
#endif
Modified:
logging/log4cxx/trunk/src/main/include/log4cxx/helpers/appenderattachableimpl.h
URL:
http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/main/include/log4cxx/helpers/appenderattachableimpl.h?rev=627302&r1=627301&r2=627302&view=diff
==============================================================================
---
logging/log4cxx/trunk/src/main/include/log4cxx/helpers/appenderattachableimpl.h
(original)
+++
logging/log4cxx/trunk/src/main/include/log4cxx/helpers/appenderattachableimpl.h
Wed Feb 13 00:12:20 2008
@@ -18,6 +18,12 @@
#ifndef _LOG4CXX_HELPERS_APPENDER_ATTACHABLE_IMPL_H
#define _LOG4CXX_HELPERS_APPENDER_ATTACHABLE_IMPL_H
+#if defined(_MSC_VER)
+#pragma warning ( push )
+#pragma warning ( disable: 4231 4251 4275 4786 )
+#endif
+
+
#include <log4cxx/spi/appenderattachable.h>
#include <log4cxx/helpers/objectimpl.h>
#include <log4cxx/helpers/mutex.h>
@@ -114,5 +120,9 @@
}
}
+
+#if defined(_MSC_VER)
+#pragma warning ( pop )
+#endif
#endif //_LOG4CXX_HELPERS_APPENDER_ATTACHABLE_IMPL_H
Modified:
logging/log4cxx/trunk/src/main/include/log4cxx/helpers/bytearrayinputstream.h
URL:
http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/main/include/log4cxx/helpers/bytearrayinputstream.h?rev=627302&r1=627301&r2=627302&view=diff
==============================================================================
---
logging/log4cxx/trunk/src/main/include/log4cxx/helpers/bytearrayinputstream.h
(original)
+++
logging/log4cxx/trunk/src/main/include/log4cxx/helpers/bytearrayinputstream.h
Wed Feb 13 00:12:20 2008
@@ -20,7 +20,7 @@
#if defined(_MSC_VER)
#pragma warning ( push )
-#pragma warning ( disable: 4786 4231 )
+#pragma warning ( disable: 4231 4251 4275 4786 )
#endif
Modified:
logging/log4cxx/trunk/src/main/include/log4cxx/helpers/bytearrayoutputstream.h
URL:
http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/main/include/log4cxx/helpers/bytearrayoutputstream.h?rev=627302&r1=627301&r2=627302&view=diff
==============================================================================
---
logging/log4cxx/trunk/src/main/include/log4cxx/helpers/bytearrayoutputstream.h
(original)
+++
logging/log4cxx/trunk/src/main/include/log4cxx/helpers/bytearrayoutputstream.h
Wed Feb 13 00:12:20 2008
@@ -20,7 +20,7 @@
#if defined(_MSC_VER)
#pragma warning ( push )
-#pragma warning ( disable: 4786 4231 )
+#pragma warning ( disable: 4231 4251 4275 4786 )
#endif
Modified: logging/log4cxx/trunk/src/main/include/log4cxx/helpers/class.h
URL:
http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/main/include/log4cxx/helpers/class.h?rev=627302&r1=627301&r2=627302&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/main/include/log4cxx/helpers/class.h (original)
+++ logging/log4cxx/trunk/src/main/include/log4cxx/helpers/class.h Wed Feb 13
00:12:20 2008
@@ -20,7 +20,7 @@
#if defined(_MSC_VER)
#pragma warning (push)
-#pragma warning (disable: 4786 4231)
+#pragma warning ( disable: 4231 4251 4275 4786 )
#endif
Modified: logging/log4cxx/trunk/src/main/include/log4cxx/helpers/inetaddress.h
URL:
http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/main/include/log4cxx/helpers/inetaddress.h?rev=627302&r1=627301&r2=627302&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/main/include/log4cxx/helpers/inetaddress.h
(original)
+++ logging/log4cxx/trunk/src/main/include/log4cxx/helpers/inetaddress.h Wed
Feb 13 00:12:20 2008
@@ -20,7 +20,7 @@
#if defined(_MSC_VER)
#pragma warning ( push )
-#pragma warning ( disable: 4786 4231 )
+#pragma warning ( disable: 4231 4251 4275 4786 )
#endif
Modified: logging/log4cxx/trunk/src/main/include/log4cxx/helpers/properties.h
URL:
http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/main/include/log4cxx/helpers/properties.h?rev=627302&r1=627301&r2=627302&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/main/include/log4cxx/helpers/properties.h
(original)
+++ logging/log4cxx/trunk/src/main/include/log4cxx/helpers/properties.h Wed Feb
13 00:12:20 2008
@@ -20,7 +20,7 @@
#if defined(_MSC_VER)
#pragma warning (push)
-#pragma warning (disable: 4786 4231)
+#pragma warning ( disable: 4231 4251 4275 4786 )
#endif
Modified:
logging/log4cxx/trunk/src/main/include/log4cxx/helpers/simpledateformat.h
URL:
http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/main/include/log4cxx/helpers/simpledateformat.h?rev=627302&r1=627301&r2=627302&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/main/include/log4cxx/helpers/simpledateformat.h
(original)
+++ logging/log4cxx/trunk/src/main/include/log4cxx/helpers/simpledateformat.h
Wed Feb 13 00:12:20 2008
@@ -20,7 +20,7 @@
#if defined(_MSC_VER)
#pragma warning ( push )
-#pragma warning ( disable: 4786 4231 )
+#pragma warning ( disable: 4231 4251 4275 4786 )
#endif
Modified:
logging/log4cxx/trunk/src/main/include/log4cxx/helpers/socketoutputstream.h
URL:
http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/main/include/log4cxx/helpers/socketoutputstream.h?rev=627302&r1=627301&r2=627302&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/main/include/log4cxx/helpers/socketoutputstream.h
(original)
+++ logging/log4cxx/trunk/src/main/include/log4cxx/helpers/socketoutputstream.h
Wed Feb 13 00:12:20 2008
@@ -20,7 +20,7 @@
#if defined(_MSC_VER)
#pragma warning ( push )
-#pragma warning ( disable: 4786 4231 )
+#pragma warning ( disable: 4231 4251 4275 4786 )
#endif
Modified: logging/log4cxx/trunk/src/main/include/log4cxx/helpers/transcoder.h
URL:
http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/main/include/log4cxx/helpers/transcoder.h?rev=627302&r1=627301&r2=627302&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/main/include/log4cxx/helpers/transcoder.h
(original)
+++ logging/log4cxx/trunk/src/main/include/log4cxx/helpers/transcoder.h Wed Feb
13 00:12:20 2008
@@ -20,7 +20,7 @@
#if defined(_MSC_VER)
#pragma warning ( push )
-#pragma warning ( disable: 4786 4231 )
+#pragma warning ( disable: 4231 4251 4275 4786 )
#endif
#include <log4cxx/logstring.h>
Modified: logging/log4cxx/trunk/src/main/include/log4cxx/helpers/xml.h
URL:
http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/main/include/log4cxx/helpers/xml.h?rev=627302&r1=627301&r2=627302&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/main/include/log4cxx/helpers/xml.h (original)
+++ logging/log4cxx/trunk/src/main/include/log4cxx/helpers/xml.h Wed Feb 13
00:12:20 2008
@@ -20,7 +20,7 @@
#if defined(_MSC_VER)
#pragma warning ( push )
-#pragma warning ( disable: 4786 4231 )
+#pragma warning ( disable: 4231 4251 4275 4786 )
#endif
Modified: logging/log4cxx/trunk/src/main/include/log4cxx/hierarchy.h
URL:
http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/main/include/log4cxx/hierarchy.h?rev=627302&r1=627301&r2=627302&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/main/include/log4cxx/hierarchy.h (original)
+++ logging/log4cxx/trunk/src/main/include/log4cxx/hierarchy.h Wed Feb 13
00:12:20 2008
@@ -20,7 +20,7 @@
#if defined(_MSC_VER)
#pragma warning (push)
-#pragma warning (disable: 4786 4231)
+#pragma warning ( disable: 4231 4251 4275 4786 )
#endif
#include <log4cxx/spi/loggerrepository.h>
Modified: logging/log4cxx/trunk/src/main/include/log4cxx/htmllayout.h
URL:
http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/main/include/log4cxx/htmllayout.h?rev=627302&r1=627301&r2=627302&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/main/include/log4cxx/htmllayout.h (original)
+++ logging/log4cxx/trunk/src/main/include/log4cxx/htmllayout.h Wed Feb 13
00:12:20 2008
@@ -18,6 +18,12 @@
#ifndef _LOG4CXX_HTML_LAYOUT_H
#define _LOG4CXX_HTML_LAYOUT_H
+#if defined(_MSC_VER)
+#pragma warning ( push )
+#pragma warning ( disable: 4231 4251 4275 4786 )
+#endif
+
+
#include <log4cxx/layout.h>
#include <log4cxx/helpers/iso8601dateformat.h>
@@ -118,5 +124,10 @@
}; // class HtmlLayout
LOG4CXX_PTR_DEF(HTMLLayout);
} // namespace log4cxx
+
+#if defined(_MSC_VER)
+#pragma warning ( pop )
+#endif
+
#endif // _LOG4CXX_HTML_LAYOUT_H
Modified: logging/log4cxx/trunk/src/main/include/log4cxx/layout.h
URL:
http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/main/include/log4cxx/layout.h?rev=627302&r1=627301&r2=627302&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/main/include/log4cxx/layout.h (original)
+++ logging/log4cxx/trunk/src/main/include/log4cxx/layout.h Wed Feb 13 00:12:20
2008
@@ -20,7 +20,7 @@
#if defined(_MSC_VER)
#pragma warning ( push )
-#pragma warning ( disable: 4231 )
+#pragma warning ( disable: 4231 4251 4275 4786 )
#endif
Modified: logging/log4cxx/trunk/src/main/include/log4cxx/logger.h
URL:
http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/main/include/log4cxx/logger.h?rev=627302&r1=627301&r2=627302&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/main/include/log4cxx/logger.h (original)
+++ logging/log4cxx/trunk/src/main/include/log4cxx/logger.h Wed Feb 13 00:12:20
2008
@@ -20,7 +20,7 @@
#if defined(_MSC_VER)
#pragma warning ( push )
-#pragma warning ( disable: 4786 4231 )
+#pragma warning ( disable: 4231 4251 4275 4786 )
#endif
#include <log4cxx/helpers/appenderattachableimpl.h>
Modified: logging/log4cxx/trunk/src/main/include/log4cxx/logstring.h
URL:
http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/main/include/log4cxx/logstring.h?rev=627302&r1=627301&r2=627302&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/main/include/log4cxx/logstring.h (original)
+++ logging/log4cxx/trunk/src/main/include/log4cxx/logstring.h Wed Feb 13
00:12:20 2008
@@ -20,7 +20,7 @@
#if defined(_MSC_VER)
#pragma warning ( push )
-#pragma warning ( disable: 4786 4231 )
+#pragma warning ( disable: 4231 4251 4275 4786 )
#endif
Modified: logging/log4cxx/trunk/src/main/include/log4cxx/mdc.h
URL:
http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/main/include/log4cxx/mdc.h?rev=627302&r1=627301&r2=627302&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/main/include/log4cxx/mdc.h (original)
+++ logging/log4cxx/trunk/src/main/include/log4cxx/mdc.h Wed Feb 13 00:12:20
2008
@@ -20,7 +20,7 @@
#if defined(_MSC_VER)
#pragma warning (push)
-#pragma warning (disable: 4786 4231)
+#pragma warning ( disable: 4231 4251 4275 4786 )
#endif
#include <log4cxx/log4cxx.h>
Modified: logging/log4cxx/trunk/src/main/include/log4cxx/ndc.h
URL:
http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/main/include/log4cxx/ndc.h?rev=627302&r1=627301&r2=627302&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/main/include/log4cxx/ndc.h (original)
+++ logging/log4cxx/trunk/src/main/include/log4cxx/ndc.h Wed Feb 13 00:12:20
2008
@@ -20,7 +20,7 @@
#if defined(_MSC_VER)
#pragma warning ( push )
-#pragma warning ( disable: 4786 4231 )
+#pragma warning ( disable: 4231 4251 4275 4786 )
#endif
#include <log4cxx/log4cxx.h>
Modified: logging/log4cxx/trunk/src/main/include/log4cxx/net/sockethubappender.h
URL:
http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/main/include/log4cxx/net/sockethubappender.h?rev=627302&r1=627301&r2=627302&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/main/include/log4cxx/net/sockethubappender.h
(original)
+++ logging/log4cxx/trunk/src/main/include/log4cxx/net/sockethubappender.h Wed
Feb 13 00:12:20 2008
@@ -20,7 +20,7 @@
#if defined(_MSC_VER)
#pragma warning ( push )
-#pragma warning ( disable: 4786 4231 )
+#pragma warning ( disable: 4231 4251 4275 4786 )
#endif
Modified: logging/log4cxx/trunk/src/main/include/log4cxx/net/telnetappender.h
URL:
http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/main/include/log4cxx/net/telnetappender.h?rev=627302&r1=627301&r2=627302&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/main/include/log4cxx/net/telnetappender.h
(original)
+++ logging/log4cxx/trunk/src/main/include/log4cxx/net/telnetappender.h Wed Feb
13 00:12:20 2008
@@ -20,7 +20,7 @@
#if defined(_MSC_VER)
#pragma warning ( push )
-#pragma warning ( disable: 4786 4231 )
+#pragma warning ( disable: 4231 4251 4275 4786 )
#endif
Modified:
logging/log4cxx/trunk/src/main/include/log4cxx/pattern/patternconverter.h
URL:
http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/main/include/log4cxx/pattern/patternconverter.h?rev=627302&r1=627301&r2=627302&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/main/include/log4cxx/pattern/patternconverter.h
(original)
+++ logging/log4cxx/trunk/src/main/include/log4cxx/pattern/patternconverter.h
Wed Feb 13 00:12:20 2008
@@ -25,7 +25,7 @@
#ifdef _MSC_VER
// disable identifier too wide for debugging warning
-#pragma warning (disable : 4786)
+#pragma warning ( disable: 4231 4251 4275 4786 )
#endif
#define DECLARE_LOG4CXX_PATTERN(cls) DECLARE_ABSTRACT_LOG4CXX_OBJECT(cls)
Modified: logging/log4cxx/trunk/src/main/include/log4cxx/pattern/patternparser.h
URL:
http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/main/include/log4cxx/pattern/patternparser.h?rev=627302&r1=627301&r2=627302&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/main/include/log4cxx/pattern/patternparser.h
(original)
+++ logging/log4cxx/trunk/src/main/include/log4cxx/pattern/patternparser.h Wed
Feb 13 00:12:20 2008
@@ -21,7 +21,7 @@
#if defined(_MSC_VER)
#pragma warning (push)
-#pragma warning (disable: 4786 4231)
+#pragma warning ( disable: 4231 4251 4275 4786 )
#endif
Modified: logging/log4cxx/trunk/src/main/include/log4cxx/patternlayout.h
URL:
http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/main/include/log4cxx/patternlayout.h?rev=627302&r1=627301&r2=627302&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/main/include/log4cxx/patternlayout.h (original)
+++ logging/log4cxx/trunk/src/main/include/log4cxx/patternlayout.h Wed Feb 13
00:12:20 2008
@@ -20,7 +20,7 @@
#if defined(_MSC_VER)
#pragma warning ( push )
-#pragma warning ( disable: 4786 4231 )
+#pragma warning ( disable: 4231 4251 4275 4786 )
#endif
Modified: logging/log4cxx/trunk/src/main/include/log4cxx/propertyconfigurator.h
URL:
http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/main/include/log4cxx/propertyconfigurator.h?rev=627302&r1=627301&r2=627302&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/main/include/log4cxx/propertyconfigurator.h
(original)
+++ logging/log4cxx/trunk/src/main/include/log4cxx/propertyconfigurator.h Wed
Feb 13 00:12:20 2008
@@ -20,7 +20,7 @@
#if defined(_MSC_VER)
#pragma warning (push)
-#pragma warning (disable: 4786 4231)
+#pragma warning ( disable: 4231 4251 4275 4786 )
#endif
Modified:
logging/log4cxx/trunk/src/main/include/log4cxx/rolling/gzcompressaction.h
URL:
http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/main/include/log4cxx/rolling/gzcompressaction.h?rev=627302&r1=627301&r2=627302&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/main/include/log4cxx/rolling/gzcompressaction.h
(original)
+++ logging/log4cxx/trunk/src/main/include/log4cxx/rolling/gzcompressaction.h
Wed Feb 13 00:12:20 2008
@@ -20,7 +20,7 @@
#if defined(_MSC_VER)
#pragma warning ( push )
-#pragma warning ( disable: 4786 4231 )
+#pragma warning ( disable: 4231 4251 4275 4786 )
#endif
#include <log4cxx/rolling/action.h>
Modified:
logging/log4cxx/trunk/src/main/include/log4cxx/rolling/rollingpolicybase.h
URL:
http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/main/include/log4cxx/rolling/rollingpolicybase.h?rev=627302&r1=627301&r2=627302&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/main/include/log4cxx/rolling/rollingpolicybase.h
(original)
+++ logging/log4cxx/trunk/src/main/include/log4cxx/rolling/rollingpolicybase.h
Wed Feb 13 00:12:20 2008
@@ -20,7 +20,7 @@
#if defined(_MSC_VER)
#pragma warning ( push )
-#pragma warning ( disable: 4786 4231 )
+#pragma warning ( disable: 4231 4251 4275 4786 )
#endif
Modified:
logging/log4cxx/trunk/src/main/include/log4cxx/rolling/zipcompressaction.h
URL:
http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/main/include/log4cxx/rolling/zipcompressaction.h?rev=627302&r1=627301&r2=627302&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/main/include/log4cxx/rolling/zipcompressaction.h
(original)
+++ logging/log4cxx/trunk/src/main/include/log4cxx/rolling/zipcompressaction.h
Wed Feb 13 00:12:20 2008
@@ -20,7 +20,7 @@
#if defined(_MSC_VER)
#pragma warning ( push )
-#pragma warning ( disable: 4786 4231 )
+#pragma warning ( disable: 4231 4251 4275 4786 )
#endif
Modified: logging/log4cxx/trunk/src/main/include/log4cxx/rollingfileappender.h
URL:
http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/main/include/log4cxx/rollingfileappender.h?rev=627302&r1=627301&r2=627302&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/main/include/log4cxx/rollingfileappender.h
(original)
+++ logging/log4cxx/trunk/src/main/include/log4cxx/rollingfileappender.h Wed
Feb 13 00:12:20 2008
@@ -17,6 +17,11 @@
#ifndef _LOG4CXX_ROLLING_FILE_APPENDER_H
#define _LOG4CXX_ROLLING_FILE_APPENDER_H
+#if defined(_MSC_VER)
+#pragma warning ( push )
+#pragma warning ( disable: 4231 4251 4275 4786 )
+#endif
+
#include <log4cxx/rolling/rollingfileappender.h>
namespace log4cxx
@@ -247,5 +252,10 @@
LOG4CXX_PTR_DEF(RollingFileAppender)
} // namespace log4cxx
+
+
+#if defined(_MSC_VER)
+#pragma warning ( pop )
+#endif
#endif //_LOG4CXX_ROLLING_FILE_APPENDER_H
Modified: logging/log4cxx/trunk/src/main/include/log4cxx/simplelayout.h
URL:
http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/main/include/log4cxx/simplelayout.h?rev=627302&r1=627301&r2=627302&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/main/include/log4cxx/simplelayout.h (original)
+++ logging/log4cxx/trunk/src/main/include/log4cxx/simplelayout.h Wed Feb 13
00:12:20 2008
@@ -18,6 +18,12 @@
#ifndef _LOG4CXX_SIMPLE_LAYOUT_H
#define _LOG4CXX_SIMPLE_LAYOUT_H
+#if defined(_MSC_VER)
+#pragma warning ( push )
+#pragma warning ( disable: 4231 4251 4275 4786 )
+#endif
+
+
#include <log4cxx/layout.h>
namespace log4cxx
@@ -68,5 +74,10 @@
};
LOG4CXX_PTR_DEF(SimpleLayout);
} // namespace log4cxx
+
+
+#if defined(_MSC_VER)
+#pragma warning ( pop )
+#endif
#endif //_LOG4CXX_SIMPLE_LAYOUT_H
Modified:
logging/log4cxx/trunk/src/main/include/log4cxx/spi/appenderattachable.h
URL:
http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/main/include/log4cxx/spi/appenderattachable.h?rev=627302&r1=627301&r2=627302&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/main/include/log4cxx/spi/appenderattachable.h
(original)
+++ logging/log4cxx/trunk/src/main/include/log4cxx/spi/appenderattachable.h Wed
Feb 13 00:12:20 2008
@@ -20,7 +20,7 @@
#if defined(_MSC_VER)
#pragma warning ( push )
-#pragma warning ( disable: 4786 4231 )
+#pragma warning ( disable: 4231 4251 4275 4786 )
#endif
#include <log4cxx/logstring.h>
Modified: logging/log4cxx/trunk/src/main/include/log4cxx/spi/errorhandler.h
URL:
http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/main/include/log4cxx/spi/errorhandler.h?rev=627302&r1=627301&r2=627302&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/main/include/log4cxx/spi/errorhandler.h (original)
+++ logging/log4cxx/trunk/src/main/include/log4cxx/spi/errorhandler.h Wed Feb
13 00:12:20 2008
@@ -20,7 +20,7 @@
#if defined(_MSC_VER)
#pragma warning ( push )
-#pragma warning ( disable: 4231 )
+#pragma warning ( disable: 4231 4251 4275 4786 )
#endif
Modified:
logging/log4cxx/trunk/src/main/include/log4cxx/spi/hierarchyeventlistener.h
URL:
http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/main/include/log4cxx/spi/hierarchyeventlistener.h?rev=627302&r1=627301&r2=627302&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/main/include/log4cxx/spi/hierarchyeventlistener.h
(original)
+++ logging/log4cxx/trunk/src/main/include/log4cxx/spi/hierarchyeventlistener.h
Wed Feb 13 00:12:20 2008
@@ -20,7 +20,7 @@
#if defined(_MSC_VER)
#pragma warning ( push )
-#pragma warning ( disable: 4786 4231 )
+#pragma warning ( disable: 4231 4251 4275 4786 )
#endif
Modified: logging/log4cxx/trunk/src/main/include/log4cxx/spi/loggerrepository.h
URL:
http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/main/include/log4cxx/spi/loggerrepository.h?rev=627302&r1=627301&r2=627302&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/main/include/log4cxx/spi/loggerrepository.h
(original)
+++ logging/log4cxx/trunk/src/main/include/log4cxx/spi/loggerrepository.h Wed
Feb 13 00:12:20 2008
@@ -20,7 +20,7 @@
#if defined(_MSC_VER)
#pragma warning ( push )
-#pragma warning ( disable: 4786 4231 )
+#pragma warning ( disable: 4231 4251 4275 4786 )
#endif
Modified: logging/log4cxx/trunk/src/main/include/log4cxx/spi/loggingevent.h
URL:
http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/main/include/log4cxx/spi/loggingevent.h?rev=627302&r1=627301&r2=627302&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/main/include/log4cxx/spi/loggingevent.h (original)
+++ logging/log4cxx/trunk/src/main/include/log4cxx/spi/loggingevent.h Wed Feb
13 00:12:20 2008
@@ -20,7 +20,7 @@
#if defined(_MSC_VER)
#pragma warning (push)
-#pragma warning (disable: 4786 4231)
+#pragma warning ( disable: 4231 4251 4275 4786 )
#endif
Modified: logging/log4cxx/trunk/src/main/include/log4cxx/ttcclayout.h
URL:
http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/main/include/log4cxx/ttcclayout.h?rev=627302&r1=627301&r2=627302&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/main/include/log4cxx/ttcclayout.h (original)
+++ logging/log4cxx/trunk/src/main/include/log4cxx/ttcclayout.h Wed Feb 13
00:12:20 2008
@@ -18,6 +18,11 @@
#ifndef _LOG4CXX_TTCC_LAYOUT_H
#define _LOG4CXX_TTCC_LAYOUT_H
+#if defined(_MSC_VER)
+#pragma warning ( push )
+#pragma warning ( disable: 4231 4251 4275 4786 )
+#endif
+
#include <log4cxx/helpers/datelayout.h>
namespace log4cxx
@@ -172,5 +177,10 @@
};
LOG4CXX_PTR_DEF(TTCCLayout);
}
+
+
+#if defined(_MSC_VER)
+#pragma warning ( pop )
+#endif
#endif
Modified: logging/log4cxx/trunk/src/main/include/log4cxx/writerappender.h
URL:
http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/main/include/log4cxx/writerappender.h?rev=627302&r1=627301&r2=627302&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/main/include/log4cxx/writerappender.h (original)
+++ logging/log4cxx/trunk/src/main/include/log4cxx/writerappender.h Wed Feb 13
00:12:20 2008
@@ -18,6 +18,11 @@
#ifndef _LOG4CXX_WRITER_APPENDER_H
#define _LOG4CXX_WRITER_APPENDER_H
+#if defined(_MSC_VER)
+#pragma warning ( push )
+#pragma warning ( disable: 4231 4251 4275 4786 )
+#endif
+
#include <log4cxx/appenderskeleton.h>
#include <log4cxx/helpers/outputstreamwriter.h>
@@ -204,5 +209,9 @@
LOG4CXX_PTR_DEF(WriterAppender);
} //namespace log4cxx
+
+#if defined(_MSC_VER)
+#pragma warning ( pop )
+#endif
#endif //_LOG4CXX_WRITER_APPENDER_H
Modified: logging/log4cxx/trunk/src/main/include/log4cxx/xml/domconfigurator.h
URL:
http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/main/include/log4cxx/xml/domconfigurator.h?rev=627302&r1=627301&r2=627302&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/main/include/log4cxx/xml/domconfigurator.h
(original)
+++ logging/log4cxx/trunk/src/main/include/log4cxx/xml/domconfigurator.h Wed
Feb 13 00:12:20 2008
@@ -20,7 +20,7 @@
#if defined(_MSC_VER)
#pragma warning (push)
-#pragma warning (disable: 4786 4231)
+#pragma warning ( disable: 4231 4251 4275 4786 )
#endif
Modified: logging/log4cxx/trunk/src/test/cpp/logunit.cpp
URL:
http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/test/cpp/logunit.cpp?rev=627302&r1=627301&r2=627302&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/test/cpp/logunit.cpp (original)
+++ logging/log4cxx/trunk/src/test/cpp/logunit.cpp Wed Feb 13 00:12:20 2008
@@ -15,7 +15,7 @@
* limitations under the License.
*/
#if defined(_MSC_VER)
-#pragma warning ( disable: 4786 4231 )
+#pragma warning ( disable: 4231 4251 4275 4786 )
#endif
#include "logunit.h"
Modified: logging/log4cxx/trunk/src/test/cpp/logunit.h
URL:
http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/test/cpp/logunit.h?rev=627302&r1=627301&r2=627302&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/test/cpp/logunit.h (original)
+++ logging/log4cxx/trunk/src/test/cpp/logunit.h Wed Feb 13 00:12:20 2008
@@ -21,7 +21,7 @@
#if defined(_MSC_VER)
#pragma warning (push)
-#pragma warning (disable: 4786 4231)
+#pragma warning ( disable: 4231 4251 4275 4786 )
#endif
#include "abts.h"
Modified: logging/log4cxx/trunk/src/test/cpp/util/filter.h
URL:
http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/test/cpp/util/filter.h?rev=627302&r1=627301&r2=627302&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/test/cpp/util/filter.h (original)
+++ logging/log4cxx/trunk/src/test/cpp/util/filter.h Wed Feb 13 00:12:20 2008
@@ -20,7 +20,7 @@
#if defined(_MSC_VER)
#pragma warning (push)
-#pragma warning (disable: 4786 4231)
+#pragma warning ( disable: 4231 4251 4275 4786 )
#endif
#include <string>
