You are viewing a plain text version of this content. The canonical link for it is here.
Posted to log4cxx-dev@logging.apache.org by ca...@apache.org on 2008/01/20 02:21:16 UTC
svn commit: r613491 - in /logging/log4cxx/trunk/src/main: cpp/
include/log4cxx/ include/log4cxx/filter/ include/log4cxx/helpers/
include/log4cxx/net/ include/log4cxx/pattern/ include/log4cxx/rolling/
include/log4cxx/spi/ include/log4cxx/spi/location/ i...
Author: carnold
Date: Sat Jan 19 17:21:13 2008
New Revision: 613491
URL: http://svn.apache.org/viewvc?rev=613491&view=rev
Log:
LOGCXX-219: Eliminate templated functions in ObjectPtrT template to fix VC6 build
Modified:
logging/log4cxx/trunk/src/main/cpp/asyncappender.cpp
logging/log4cxx/trunk/src/main/cpp/hierarchy.cpp
logging/log4cxx/trunk/src/main/cpp/logger.cpp
logging/log4cxx/trunk/src/main/cpp/loglog.cpp
logging/log4cxx/trunk/src/main/cpp/ndc.cpp
logging/log4cxx/trunk/src/main/cpp/objectptr.cpp
logging/log4cxx/trunk/src/main/cpp/propertyresourcebundle.cpp
logging/log4cxx/trunk/src/main/cpp/rollingfileappender.cpp
logging/log4cxx/trunk/src/main/include/log4cxx/appender.h
logging/log4cxx/trunk/src/main/include/log4cxx/asyncappender.h
logging/log4cxx/trunk/src/main/include/log4cxx/basicconfigurator.h
logging/log4cxx/trunk/src/main/include/log4cxx/filter/propertyfilter.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/objectptr.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/hierarchy.h
logging/log4cxx/trunk/src/main/include/log4cxx/log4cxx.h.in
logging/log4cxx/trunk/src/main/include/log4cxx/log4cxx.hw
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/net/xmlsocketappender.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/rollingpolicybase.h
logging/log4cxx/trunk/src/main/include/log4cxx/spi/hierarchyeventlistener.h
logging/log4cxx/trunk/src/main/include/log4cxx/spi/location/locationinfo.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/xml/domconfigurator.h
Modified: logging/log4cxx/trunk/src/main/cpp/asyncappender.cpp
URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/main/cpp/asyncappender.cpp?rev=613491&r1=613490&r2=613491&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/main/cpp/asyncappender.cpp (original)
+++ logging/log4cxx/trunk/src/main/cpp/asyncappender.cpp Sat Jan 19 17:21:13 2008
@@ -15,6 +15,10 @@
* limitations under the License.
*/
+#if defined(_MSC_VER)
+#pragma warning ( disable: 4786 4231 )
+#endif
+
#include <log4cxx/asyncappender.h>
Modified: logging/log4cxx/trunk/src/main/cpp/hierarchy.cpp
URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/main/cpp/hierarchy.cpp?rev=613491&r1=613490&r2=613491&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/main/cpp/hierarchy.cpp (original)
+++ logging/log4cxx/trunk/src/main/cpp/hierarchy.cpp Sat Jan 19 17:21:13 2008
@@ -15,6 +15,10 @@
* limitations under the License.
*/
+#if defined(_MSC_VER)
+#pragma warning (disable: 4503)
+#endif
+
#include <log4cxx/logstring.h>
#include <log4cxx/spi/loggerfactory.h>
#include <log4cxx/hierarchy.h>
Modified: logging/log4cxx/trunk/src/main/cpp/logger.cpp
URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/main/cpp/logger.cpp?rev=613491&r1=613490&r2=613491&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/main/cpp/logger.cpp (original)
+++ logging/log4cxx/trunk/src/main/cpp/logger.cpp Sat Jan 19 17:21:13 2008
@@ -29,11 +29,11 @@
#include <log4cxx/helpers/transcoder.h>
#include <log4cxx/helpers/appenderattachableimpl.h>
#include <log4cxx/helpers/exception.h>
+#include <log4cxx/helpers/aprinitializer.h>
#if !defined(LOG4CXX)
#define LOG4CXX 1
#endif
#include <log4cxx/private/log4cxx_private.h>
-#include <log4cxx/helpers/aprinitializer.h>
using namespace log4cxx;
using namespace log4cxx::helpers;
@@ -81,7 +81,9 @@
{
int writes = 0;
- for(LoggerPtr logger = this; logger != 0; logger = logger->parent)
+ for(LoggerPtr logger(this);
+ logger != 0;
+ logger = logger->parent)
{
// Protected against simultaneous call to addAppender, removeAppender,...
synchronized sync(logger->mutex);
Modified: logging/log4cxx/trunk/src/main/cpp/loglog.cpp
URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/main/cpp/loglog.cpp?rev=613491&r1=613490&r2=613491&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/main/cpp/loglog.cpp (original)
+++ logging/log4cxx/trunk/src/main/cpp/loglog.cpp Sat Jan 19 17:21:13 2008
@@ -104,6 +104,7 @@
void LogLog::emit(const LogString& msg) {
LogString out(LOG4CXX_STR("log4cxx: "));
out.append(msg);
+ out.append(1, (logchar) 0x0A);
SystemErrWriter::write(out);
}
@@ -115,5 +116,6 @@
} else {
out.append(LOG4CXX_STR("std::exception::what() == null"));
}
+ out.append(1, (logchar) 0x0A);
SystemErrWriter::write(out);
}
Modified: logging/log4cxx/trunk/src/main/cpp/ndc.cpp
URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/main/cpp/ndc.cpp?rev=613491&r1=613490&r2=613491&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/main/cpp/ndc.cpp (original)
+++ logging/log4cxx/trunk/src/main/cpp/ndc.cpp Sat Jan 19 17:21:13 2008
@@ -15,6 +15,11 @@
* limitations under the License.
*/
+#if defined(_MSC_VER)
+#pragma warning ( disable: 4786 4231 )
+#endif
+
+
#include <log4cxx/ndc.h>
#include <log4cxx/helpers/transcoder.h>
#include <log4cxx/helpers/threadspecificdata.h>
Modified: logging/log4cxx/trunk/src/main/cpp/objectptr.cpp
URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/main/cpp/objectptr.cpp?rev=613491&r1=613490&r2=613491&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/main/cpp/objectptr.cpp (original)
+++ logging/log4cxx/trunk/src/main/cpp/objectptr.cpp Sat Jan 19 17:21:13 2008
@@ -21,6 +21,12 @@
using namespace log4cxx::helpers;
+ObjectPtrBase::ObjectPtrBase() {
+}
+
+ObjectPtrBase::~ObjectPtrBase() {
+}
+
void ObjectPtrBase::checkNull(const int& null) {
if (null != 0) {
throw IllegalArgumentException(LOG4CXX_STR("Attempt to set pointer to a non-zero numeric value."));
Modified: logging/log4cxx/trunk/src/main/cpp/propertyresourcebundle.cpp
URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/main/cpp/propertyresourcebundle.cpp?rev=613491&r1=613490&r2=613491&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/main/cpp/propertyresourcebundle.cpp (original)
+++ logging/log4cxx/trunk/src/main/cpp/propertyresourcebundle.cpp Sat Jan 19 17:21:13 2008
@@ -36,7 +36,7 @@
LogString PropertyResourceBundle::getString(const LogString& key) const
{
LogString resource;
- PropertyResourceBundlePtr resourceBundle = this;
+ PropertyResourceBundlePtr resourceBundle(this);
do
{
Modified: logging/log4cxx/trunk/src/main/cpp/rollingfileappender.cpp
URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/main/cpp/rollingfileappender.cpp?rev=613491&r1=613490&r2=613491&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/main/cpp/rollingfileappender.cpp (original)
+++ logging/log4cxx/trunk/src/main/cpp/rollingfileappender.cpp Sat Jan 19 17:21:13 2008
@@ -15,6 +15,10 @@
* limitations under the License.
*/
+#if defined(_MSC_VER)
+#pragma warning ( disable: 4786 4231 )
+#endif
+
#include <log4cxx/rolling/rollingfileappender.h>
#include <log4cxx/helpers/loglog.h>
#include <log4cxx/helpers/synchronized.h>
@@ -43,7 +47,7 @@
*/
void RollingFileAppender::activateOptions(Pool &p) {
if (rollingPolicy == NULL) {
- FixedWindowRollingPolicyPtr fwrp(new FixedWindowRollingPolicy());
+ FixedWindowRollingPolicy* fwrp = new FixedWindowRollingPolicy();
fwrp->setFileNamePattern(getFile() + LOG4CXX_STR(".%i"));
rollingPolicy = fwrp;
}
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=613491&r1=613490&r2=613491&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/main/include/log4cxx/appender.h (original)
+++ logging/log4cxx/trunk/src/main/include/log4cxx/appender.h Sat Jan 19 17:21:13 2008
@@ -18,6 +18,12 @@
#ifndef _LOG4CXX_APPENDER_H
#define _LOG4CXX_APPENDER_H
+#if defined(_MSC_VER)
+#pragma warning ( push )
+#pragma warning ( disable: 4786 4231 )
+#endif
+
+
#include <log4cxx/spi/optionhandler.h>
#include <log4cxx/helpers/objectptr.h>
#include <log4cxx/helpers/object.h>
@@ -134,5 +140,9 @@
LOG4CXX_LIST_DEF(AppenderList, AppenderPtr)
}
+
+#if defined(_MSC_VER)
+#pragma warning ( pop )
+#endif
#endif //_LOG4CXX_APPENDER_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=613491&r1=613490&r2=613491&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/main/include/log4cxx/asyncappender.h (original)
+++ logging/log4cxx/trunk/src/main/include/log4cxx/asyncappender.h Sat Jan 19 17:21:13 2008
@@ -20,7 +20,7 @@
#if defined(_MSC_VER)
#pragma warning ( push )
-#pragma warning ( disable: 4231 )
+#pragma warning ( disable: 4786 4231 )
#endif
Modified: logging/log4cxx/trunk/src/main/include/log4cxx/basicconfigurator.h
URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/main/include/log4cxx/basicconfigurator.h?rev=613491&r1=613490&r2=613491&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/main/include/log4cxx/basicconfigurator.h (original)
+++ logging/log4cxx/trunk/src/main/include/log4cxx/basicconfigurator.h Sat Jan 19 17:21:13 2008
@@ -23,7 +23,6 @@
#include <log4cxx/logger.h>
#include <log4cxx/logstring.h>
#include <log4cxx/spi/configurator.h>
-#include <map>
namespace log4cxx
{
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=613491&r1=613490&r2=613491&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/main/include/log4cxx/filter/propertyfilter.h (original)
+++ logging/log4cxx/trunk/src/main/include/log4cxx/filter/propertyfilter.h Sat Jan 19 17:21:13 2008
@@ -19,6 +19,12 @@
#ifndef _LOG4CXX_FILTER_PROPERTYFILTER_H
#define _LOG4CXX_FILTER_PROPERTYFILTER_H
+#if defined(_MSC_VER)
+#pragma warning (push)
+#pragma warning (disable: 4786 4231)
+#endif
+
+
#include <log4cxx/spi/filter.h>
#include <map>
@@ -67,4 +73,9 @@
}
}
+
+#if defined(_MSC_VER)
+#pragma warning (pop)
+#endif
+
#endif
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=613491&r1=613490&r2=613491&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/main/include/log4cxx/helpers/bytearrayinputstream.h (original)
+++ logging/log4cxx/trunk/src/main/include/log4cxx/helpers/bytearrayinputstream.h Sat Jan 19 17:21:13 2008
@@ -17,6 +17,12 @@
#ifndef _LOG4CXX_HELPERS_BYTEARRAYINPUTSTREAM_H
#define _LOG4CXX_HELPERS_BYTEARRAYINPUTSTREAM_H
+
+#if defined(_MSC_VER)
+#pragma warning ( push )
+#pragma warning ( disable: 4786 4231 )
+#endif
+
#include <vector>
#include <log4cxx/helpers/inputstream.h>
@@ -80,6 +86,10 @@
LOG4CXX_PTR_DEF(ByteArrayInputStream)
} // namespace helpers
-} //namespace log4cxx
+} //namespace log4cxx
+
+#if defined(_MSC_VER)
+#pragma warning ( pop )
+#endif
-#endif //_LOG4CXX_HELPERS_FILEINPUTSTREAM_H
+#endif //_LOG4CXX_HELPERS_BYTEARRAYINPUTSTREAM_H
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=613491&r1=613490&r2=613491&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/main/include/log4cxx/helpers/bytearrayoutputstream.h (original)
+++ logging/log4cxx/trunk/src/main/include/log4cxx/helpers/bytearrayoutputstream.h Sat Jan 19 17:21:13 2008
@@ -16,7 +16,14 @@
*/
#ifndef _LOG4CXX_HELPERS_BYTEARRAYOUTPUTSTREAM_H
-#define _LOG4CXX_HELPERS_BYTEARRAYOUTPUTSTREAM_H
+#define _LOG4CXX_HELPERS_BYTEARRAYOUTPUTSTREAM_H
+
+#if defined(_MSC_VER)
+#pragma warning ( push )
+#pragma warning ( disable: 4786 4231 )
+#endif
+
+
#include <log4cxx/helpers/outputstream.h>
#include <vector>
@@ -61,5 +68,10 @@
} // namespace helpers
} //namespace log4cxx
+
+#if defined(_MSC_VER)
+#pragma warning ( pop )
+#endif
+
#endif //_LOG4CXX_HELPERS_BYTEARRAYOUTPUTSTREAM_H
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=613491&r1=613490&r2=613491&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/main/include/log4cxx/helpers/class.h (original)
+++ logging/log4cxx/trunk/src/main/include/log4cxx/helpers/class.h Sat Jan 19 17:21:13 2008
@@ -18,6 +18,12 @@
#ifndef _LOG4CXX_HELPERS_CLASS_H
#define _LOG4CXX_HELPERS_CLASS_H
+#if defined(_MSC_VER)
+#pragma warning (push)
+#pragma warning (disable: 4786 4231)
+#endif
+
+
#include <log4cxx/logstring.h>
#include <log4cxx/helpers/objectptr.h>
#include <map>
@@ -52,5 +58,10 @@
};
} // namespace log4cxx
} // namespace helper
+
+#if defined(_MSC_VER)
+#pragma warning (pop)
+#endif
+
#endif //_LOG4CXX_HELPERS_CLASS_H
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=613491&r1=613490&r2=613491&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/main/include/log4cxx/helpers/inetaddress.h (original)
+++ logging/log4cxx/trunk/src/main/include/log4cxx/helpers/inetaddress.h Sat Jan 19 17:21:13 2008
@@ -18,6 +18,13 @@
#ifndef _LOG4CXX_HELPER_INETADDRESS_H
#define _LOG4CXX_HELPER_INETADDRESS_H
+#if defined(_MSC_VER)
+#pragma warning ( push )
+#pragma warning ( disable: 4786 4231 )
+#endif
+
+
+
#include <log4cxx/helpers/objectimpl.h>
#include <log4cxx/helpers/objectptr.h>
#include <log4cxx/logstring.h>
@@ -89,6 +96,11 @@
}; // class InetAddress
} // namespace helpers
} // namespace log4cxx
+
+#if defined(_MSC_VER)
+#pragma warning ( pop )
+#endif
+
#endif // _LOG4CXX_HELPER_INETADDRESS_H
Modified: logging/log4cxx/trunk/src/main/include/log4cxx/helpers/objectptr.h
URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/main/include/log4cxx/helpers/objectptr.h?rev=613491&r1=613490&r2=613491&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/main/include/log4cxx/helpers/objectptr.h (original)
+++ logging/log4cxx/trunk/src/main/include/log4cxx/helpers/objectptr.h Sat Jan 19 17:21:13 2008
@@ -37,24 +37,22 @@
{
namespace helpers
{
+ class Class;
class LOG4CXX_EXPORT ObjectPtrBase {
public:
+ ObjectPtrBase();
+ virtual ~ObjectPtrBase();
static void checkNull(const int& null);
static void* exchange(void** destination, void* newValue);
+ virtual void* cast(const Class& cls) const = 0;
};
/** smart pointer to a Object descendant */
- template<typename T> class ObjectPtrT
+ template<typename T> class ObjectPtrT : public ObjectPtrBase
{
public:
- template<typename InterfacePtr> ObjectPtrT(const InterfacePtr& p1)
- _LOG4CXX_OBJECTPTR_INIT(0)
- cast(p1);
- }
-
-
ObjectPtrT(const int& null)
_LOG4CXX_OBJECTPTR_INIT(0)
ObjectPtrBase::checkNull(null);
@@ -72,6 +70,14 @@
}
}
+ ObjectPtrT(const T * p1)
+ _LOG4CXX_OBJECTPTR_INIT(const_cast<T*>(p1))
+ if (this->p != 0)
+ {
+ this->p->addRef();
+ }
+ }
+
ObjectPtrT(const ObjectPtrT& p1)
_LOG4CXX_OBJECTPTR_INIT(p1.p)
if (this->p != 0)
@@ -80,6 +86,21 @@
}
}
+ ObjectPtrT(const ObjectPtrBase& p1)
+ _LOG4CXX_OBJECTPTR_INIT(reinterpret_cast<T*>(p1.cast(T::getStaticClass())))
+ if (this->p != 0) {
+ this->p->addRef();
+ }
+ }
+
+ ObjectPtrT(ObjectPtrBase& p1)
+ _LOG4CXX_OBJECTPTR_INIT(reinterpret_cast<T*>(p1.cast(T::getStaticClass())))
+ if (this->p != 0) {
+ this->p->addRef();
+ }
+ }
+
+
~ObjectPtrT()
{
if (p != 0) {
@@ -87,13 +108,6 @@
}
}
- // Operators
- template<typename InterfacePtr> ObjectPtrT& operator=(const InterfacePtr& p1)
- {
- cast(p1);
- return *this;
- }
-
ObjectPtrT& operator=(const ObjectPtrT& p1) {
T* newPtr = (T*) p1.p;
if (newPtr != 0) {
@@ -133,28 +147,51 @@
return *this;
}
+ ObjectPtrT& operator=(const T* p1) {
+ if (p1 != 0) {
+ p1->addRef();
+ }
+ T** pp = &p;
+ void* oldPtr = ObjectPtrBase::exchange((void**) pp, const_cast<T*>(p1));
+ if (oldPtr != 0) {
+ ((T*)oldPtr)->releaseRef();
+ }
+ return *this;
+ }
+
+ ObjectPtrT& operator=(ObjectPtrBase& p1) {
+ T* newPtr = reinterpret_cast<T*>(p1.cast(T::getStaticClass()));
+ return operator=(newPtr);
+ }
+
+ ObjectPtrT& operator=(const ObjectPtrBase& p1) {
+ T* newPtr = reinterpret_cast<T*>(p1.cast(T::getStaticClass()));
+ return operator=(newPtr);
+ }
+
bool operator==(const ObjectPtrT& p1) const { return (this->p == p1.p); }
bool operator!=(const ObjectPtrT& p1) const { return (this->p != p1.p); }
+ bool operator<(const ObjectPtrT& p1) const { return (this->p < p1.p); }
bool operator==(const T* p1) const { return (this->p == p1); }
bool operator!=(const T* p1) const { return (this->p != p1); }
+ bool operator<(const T* p1) const { return (this->p < p1); }
T* operator->() const {return (T*) p; }
T& operator*() const {return (T&) *p; }
operator T*() const {return (T*) p; }
- template<typename InterfacePtr> void cast(const InterfacePtr& p1)
- {
- T* newPtr = 0;
- if (p1 != 0)
- {
- newPtr = reinterpret_cast<T*>(const_cast<void*>(p1->cast(T::getStaticClass())));
- }
- operator=(newPtr);
- }
private:
T * p;
+ virtual void* cast(const Class& cls) const {
+ if (p != 0) {
+ return const_cast<void*>(p->cast(cls));
+ }
+ return 0;
+ }
+
};
+
}
}
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=613491&r1=613490&r2=613491&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/main/include/log4cxx/helpers/properties.h (original)
+++ logging/log4cxx/trunk/src/main/include/log4cxx/helpers/properties.h Sat Jan 19 17:21:13 2008
@@ -18,6 +18,12 @@
#ifndef _LOG4CXX_HELPER_PROPERTIES_H
#define _LOG4CXX_HELPER_PROPERTIES_H
+#if defined(_MSC_VER)
+#pragma warning (push)
+#pragma warning (disable: 4786 4231)
+#endif
+
+
#include <log4cxx/logstring.h>
#include <log4cxx/helpers/objectptr.h>
#include <log4cxx/helpers/objectimpl.h>
@@ -171,5 +177,10 @@
}; // class Properties
} // namespace helpers
} // namespace log4cxx
+
+#if defined(_MSC_VER)
+#pragma warning (pop)
+#endif
+
#endif //_LOG4CXX_HELPER_PROPERTIES_H
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=613491&r1=613490&r2=613491&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/main/include/log4cxx/helpers/simpledateformat.h (original)
+++ logging/log4cxx/trunk/src/main/include/log4cxx/helpers/simpledateformat.h Sat Jan 19 17:21:13 2008
@@ -18,6 +18,13 @@
#ifndef _LOG4CXX_HELPERS_SIMPLE_DATE_FORMAT_H
#define _LOG4CXX_HELPERS_SIMPLE_DATE_FORMAT_H
+#if defined(_MSC_VER)
+#pragma warning ( push )
+#pragma warning ( disable: 4786 4231 )
+#endif
+
+
+
#include <log4cxx/helpers/dateformat.h>
#include <vector>
#include <time.h>
@@ -79,5 +86,11 @@
} // namespace helpers
} // namespace log4cxx
+
+#if defined(_MSC_VER)
+#pragma warning ( pop )
+#endif
+
+
#endif // _LOG4CXX_HELPERS_SIMPLE_DATE_FORMAT_H
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=613491&r1=613490&r2=613491&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/main/include/log4cxx/helpers/socketoutputstream.h (original)
+++ logging/log4cxx/trunk/src/main/include/log4cxx/helpers/socketoutputstream.h Sat Jan 19 17:21:13 2008
@@ -18,6 +18,12 @@
#ifndef _LOG4CXX_HELPERS_SOCKET_OUTPUT_STREAM_H
#define _LOG4CXX_HELPERS_SOCKET_OUTPUT_STREAM_H
+#if defined(_MSC_VER)
+#pragma warning ( push )
+#pragma warning ( disable: 4786 4231 )
+#endif
+
+
#include <log4cxx/logstring.h>
#include <log4cxx/helpers/outputstream.h>
#include <log4cxx/helpers/socket.h>
@@ -60,5 +66,11 @@
} // namespace helpers
} // namespace log4cxx
+
+#if defined(_MSC_VER)
+#pragma warning ( pop )
+#endif
+
+
#endif // _LOG4CXX_HELPERS_SOCKET_OUTPUT_STREAM_H
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=613491&r1=613490&r2=613491&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/main/include/log4cxx/helpers/transcoder.h (original)
+++ logging/log4cxx/trunk/src/main/include/log4cxx/helpers/transcoder.h Sat Jan 19 17:21:13 2008
@@ -18,6 +18,11 @@
#ifndef _LOG4CXX_HELPERS_TRANSCODER_H
#define _LOG4CXX_HELPERS_TRANSCODER_H
+#if defined(_MSC_VER)
+#pragma warning ( push )
+#pragma warning ( disable: 4786 4231 )
+#endif
+
#include <log4cxx/logstring.h>
@@ -228,6 +233,10 @@
log4cxx::LogString var; \
log4cxx::helpers::Transcoder::decode(src, var)
+#endif
+
+#if defined(_MSC_VER)
+#pragma warning (pop)
#endif
#endif //_LOG4CXX_HELPERS_TRANSCODER_H
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=613491&r1=613490&r2=613491&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/main/include/log4cxx/hierarchy.h (original)
+++ logging/log4cxx/trunk/src/main/include/log4cxx/hierarchy.h Sat Jan 19 17:21:13 2008
@@ -18,6 +18,11 @@
#ifndef _LOG4CXX_HIERARCHY_H
#define _LOG4CXX_HIERARCHY_H
+#if defined(_MSC_VER)
+#pragma warning (push)
+#pragma warning (disable: 4786 4231)
+#endif
+
#include <log4cxx/spi/loggerrepository.h>
#include <log4cxx/spi/loggerfactory.h>
#include <vector>
@@ -281,5 +286,10 @@
};
} //namespace log4cxx
+
+
+#if defined(_MSC_VER)
+#pragma warning (pop)
+#endif
#endif //_LOG4CXX_HIERARCHY_H
Modified: logging/log4cxx/trunk/src/main/include/log4cxx/log4cxx.h.in
URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/main/include/log4cxx/log4cxx.h.in?rev=613491&r1=613490&r2=613491&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/main/include/log4cxx/log4cxx.h.in (original)
+++ logging/log4cxx/trunk/src/main/include/log4cxx/log4cxx.h.in Sat Jan 19 17:21:13 2008
@@ -34,17 +34,18 @@
#define LOG4CXX_UNICHAR_API @UNICHAR_API@
#define LOG4CXX_CFSTRING_API @CFSTRING_API@
-#define LOG4CXX_HAS_WCHAR_T LOG4CXX_WCHAR_T_API
-
-#define LOG4CXX_EXPORT
-#define LOG4CXX_PTR_DEF(T) typedef log4cxx::helpers::ObjectPtrT<T> T##Ptr;
-#define LOG4CXX_LIST_DEF(N, T) typedef std::vector<T> N;
-
typedef long long log4cxx_int64_t;
+#define LOG4CXX_USE_GLOBAL_SCOPE_TEMPLATE 0
+#define LOG4CXX_LOGSTREAM_ADD_NOP 0
typedef log4cxx_int64_t log4cxx_time_t;
typedef int log4cxx_status_t;
typedef unsigned int log4cxx_uint32_t;
+
+
+#define LOG4CXX_EXPORT
+#define LOG4CXX_PTR_DEF(T) typedef log4cxx::helpers::ObjectPtrT<T> T##Ptr;
+#define LOG4CXX_LIST_DEF(N, T) typedef std::vector<T> N;
#endif
Modified: logging/log4cxx/trunk/src/main/include/log4cxx/log4cxx.hw
URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/main/include/log4cxx/log4cxx.hw?rev=613491&r1=613490&r2=613491&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/main/include/log4cxx/log4cxx.hw (original)
+++ logging/log4cxx/trunk/src/main/include/log4cxx/log4cxx.hw Sat Jan 19 17:21:13 2008
@@ -82,9 +82,5 @@
#endif
-#define LOG4CXX_LOCALE_ENCODING_UTF8 0
-#define LOG4CXX_LOCALE_ENCODING_ISO_8859_1 0
-#define LOG4CXX_LOCALE_ENCODING_US_ASCII 0
-
#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=613491&r1=613490&r2=613491&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/main/include/log4cxx/logger.h (original)
+++ logging/log4cxx/trunk/src/main/include/log4cxx/logger.h Sat Jan 19 17:21:13 2008
@@ -20,7 +20,7 @@
#if defined(_MSC_VER)
#pragma warning ( push )
-#pragma warning ( disable: 4231 )
+#pragma warning ( disable: 4786 4231 )
#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=613491&r1=613490&r2=613491&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/main/include/log4cxx/logstring.h (original)
+++ logging/log4cxx/trunk/src/main/include/log4cxx/logstring.h Sat Jan 19 17:21:13 2008
@@ -18,6 +18,12 @@
#ifndef _LOG4CXX_STRING_H
#define _LOG4CXX_STRING_H
+#if defined(_MSC_VER)
+#pragma warning ( push )
+#pragma warning ( disable: 4786 4231 )
+#endif
+
+
#include <string>
#include <log4cxx/log4cxx.h>
@@ -75,6 +81,10 @@
#if LOG4CXX_LOGCHAR_IS_UNICHAR || (LOG4CXX_LOGCHAR_IS_UTF8 || LOG4CXX_CHARSET_EBCDIC)
#include <log4cxx/helpers/transcoder.h>
+#endif
+
+#if defined(_MSC_VER)
+#pragma warning (pop)
#endif
#endif //_LOG4CXX_STRING_H
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=613491&r1=613490&r2=613491&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/main/include/log4cxx/mdc.h (original)
+++ logging/log4cxx/trunk/src/main/include/log4cxx/mdc.h Sat Jan 19 17:21:13 2008
@@ -18,6 +18,11 @@
#ifndef _LOG4CXX_MDC_H
#define _LOG4CXX_MDC_H
+#if defined(_MSC_VER)
+#pragma warning (push)
+#pragma warning (disable: 4786 4231)
+#endif
+
#include <log4cxx/log4cxx.h>
#include <log4cxx/logstring.h>
#include <map>
@@ -114,5 +119,10 @@
LogString key;
}; // class MDC;
} // namespace log4cxx
+
+#if defined(_MSC_VER)
+#pragma warning (pop)
+#endif
+
#endif // _LOG4CXX_MDC_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=613491&r1=613490&r2=613491&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/main/include/log4cxx/ndc.h (original)
+++ logging/log4cxx/trunk/src/main/include/log4cxx/ndc.h Sat Jan 19 17:21:13 2008
@@ -18,6 +18,11 @@
#ifndef _LOG4CXX_NDC_H
#define _LOG4CXX_NDC_H
+#if defined(_MSC_VER)
+#pragma warning ( push )
+#pragma warning ( disable: 4786 4231 )
+#endif
+
#include <log4cxx/log4cxx.h>
#include <log4cxx/logstring.h>
#include <stack>
@@ -262,5 +267,10 @@
NDC& operator=(const NDC&);
}; // class NDC;
} // namespace log4cxx
+
+#if defined(_MSC_VER)
+#pragma warning (pop)
+#endif
+
#endif // _LOG4CXX_NDC_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=613491&r1=613490&r2=613491&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/main/include/log4cxx/net/sockethubappender.h (original)
+++ logging/log4cxx/trunk/src/main/include/log4cxx/net/sockethubappender.h Sat Jan 19 17:21:13 2008
@@ -18,6 +18,12 @@
#ifndef _LOG4CXX_NET_SOCKET_HUB_APPENDER_H
#define _LOG4CXX_NET_SOCKET_HUB_APPENDER_H
+#if defined(_MSC_VER)
+#pragma warning ( push )
+#pragma warning ( disable: 4786 4231 )
+#endif
+
+
#include <log4cxx/appenderskeleton.h>
#include <vector>
#include <log4cxx/helpers/thread.h>
@@ -187,5 +193,10 @@
typedef helpers::ObjectPtrT<SocketHubAppender> SocketHubAppenderPtr;
} // namespace net
} // namespace log4cxx
+
+
+#if defined(_MSC_VER)
+#pragma warning ( pop )
+#endif
#endif // _LOG4CXX_NET_SOCKET_HUB_APPENDER_H
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=613491&r1=613490&r2=613491&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/main/include/log4cxx/net/telnetappender.h (original)
+++ logging/log4cxx/trunk/src/main/include/log4cxx/net/telnetappender.h Sat Jan 19 17:21:13 2008
@@ -18,6 +18,13 @@
#ifndef _LOG4CXX_NET_TELNET_APPENDER_H
#define _LOG4CXX_NET_TELNET_APPENDER_H
+#if defined(_MSC_VER)
+#pragma warning ( push )
+#pragma warning ( disable: 4786 4231 )
+#endif
+
+
+
#include <log4cxx/appenderskeleton.h>
#include <log4cxx/helpers/socket.h>
#include <log4cxx/helpers/serversocket.h>
@@ -139,6 +146,11 @@
}; // class TelnetAppender
} // namespace net
} // namespace log4cxx
+
+
+#if defined(_MSC_VER)
+#pragma warning ( pop )
+#endif
#endif // _LOG4CXX_NET_TELNET_APPENDER_H
Modified: logging/log4cxx/trunk/src/main/include/log4cxx/net/xmlsocketappender.h
URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/main/include/log4cxx/net/xmlsocketappender.h?rev=613491&r1=613490&r2=613491&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/main/include/log4cxx/net/xmlsocketappender.h (original)
+++ logging/log4cxx/trunk/src/main/include/log4cxx/net/xmlsocketappender.h Sat Jan 19 17:21:13 2008
@@ -19,13 +19,10 @@
#define _LOG4CXX_NET_XML_SOCKET_APPENDER_H
#include <log4cxx/net/socketappenderskeleton.h>
+#include <log4cxx/helpers/writer.h>
namespace log4cxx
{
- namespace helpers {
- class Writer;
- typedef helpers::ObjectPtrT<Writer> WriterPtr;
- }
namespace net
{
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=613491&r1=613490&r2=613491&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/main/include/log4cxx/pattern/patternparser.h (original)
+++ logging/log4cxx/trunk/src/main/include/log4cxx/pattern/patternparser.h Sat Jan 19 17:21:13 2008
@@ -19,6 +19,13 @@
#ifndef _LOG4CXX_HELPER_PATTERN_CONVERTER_H
#define _LOG4CXX_HELPER_PATTERN_CONVERTER_H
+#if defined(_MSC_VER)
+#pragma warning (push)
+#pragma warning (disable: 4786 4231)
+#endif
+
+
+
#include <map>
#include <vector>
#include <log4cxx/helpers/class.h>
@@ -166,6 +173,11 @@
}
}
+
+
+#if defined(_MSC_VER)
+#pragma warning (pop)
+#endif
#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=613491&r1=613490&r2=613491&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/main/include/log4cxx/patternlayout.h (original)
+++ logging/log4cxx/trunk/src/main/include/log4cxx/patternlayout.h Sat Jan 19 17:21:13 2008
@@ -18,6 +18,13 @@
#ifndef _LOG4CXX_PATTERN_LAYOUT_H
#define _LOG4CXX_PATTERN_LAYOUT_H
+#if defined(_MSC_VER)
+#pragma warning ( push )
+#pragma warning ( disable: 4786 4231 )
+#endif
+
+
+
#include <log4cxx/layout.h>
#include <log4cxx/pattern/loggingeventpatternconverter.h>
#include <log4cxx/pattern/formattinginfo.h>
@@ -393,6 +400,12 @@
protected:
virtual log4cxx::pattern::PatternMap getFormatSpecifiers();
};
+ LOG4CXX_PTR_DEF(PatternLayout)
} // namespace log4cxx
+
+#if defined(_MSC_VER)
+#pragma warning ( pop )
+#endif
+
#endif //_LOG4CXX_PATTERN_LAYOUT_H
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=613491&r1=613490&r2=613491&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/main/include/log4cxx/propertyconfigurator.h (original)
+++ logging/log4cxx/trunk/src/main/include/log4cxx/propertyconfigurator.h Sat Jan 19 17:21:13 2008
@@ -18,6 +18,12 @@
#ifndef _LOG4CXX_PROPERTY_CONFIGURATOR_H
#define _LOG4CXX_PROPERTY_CONFIGURATOR_H
+#if defined(_MSC_VER)
+#pragma warning (push)
+#pragma warning (disable: 4786 4231)
+#endif
+
+
#include <log4cxx/helpers/objectptr.h>
#include <log4cxx/helpers/objectimpl.h>
#include <log4cxx/logstring.h>
@@ -376,5 +382,10 @@
AppenderPtr registryGet(const LogString& name);
}; // class PropertyConfigurator
} // namespace log4cxx
+
+#if defined(_MSC_VER)
+#pragma warning (pop)
+#endif
+
#endif //_LOG4CXX_PROPERTY_CONFIGURATOR_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=613491&r1=613490&r2=613491&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/main/include/log4cxx/rolling/rollingpolicybase.h (original)
+++ logging/log4cxx/trunk/src/main/include/log4cxx/rolling/rollingpolicybase.h Sat Jan 19 17:21:13 2008
@@ -18,6 +18,12 @@
#if !defined(_LOG4CXX_ROLLING_ROLLING_POLICY_BASE_H)
#define _LOG4CXX_ROLLING_ROLLING_POLICY_BASE_H
+#if defined(_MSC_VER)
+#pragma warning ( push )
+#pragma warning ( disable: 4786 4231 )
+#endif
+
+
#include <log4cxx/helpers/object.h>
#include <log4cxx/logger.h>
#include <log4cxx/logmanager.h>
@@ -116,5 +122,9 @@
}
}
+
+#if defined(_MSC_VER)
+#pragma warning ( pop )
+#endif
#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=613491&r1=613490&r2=613491&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/main/include/log4cxx/spi/hierarchyeventlistener.h (original)
+++ logging/log4cxx/trunk/src/main/include/log4cxx/spi/hierarchyeventlistener.h Sat Jan 19 17:21:13 2008
@@ -18,6 +18,13 @@
#ifndef _LOG4CXX_SPI_HIERARCHY_EVENT_LISTENER_H
#define _LOG4CXX_SPI_HIERARCHY_EVENT_LISTENER_H
+#if defined(_MSC_VER)
+#pragma warning ( push )
+#pragma warning ( disable: 4786 4231 )
+#endif
+
+
+
#include <log4cxx/appender.h>
namespace log4cxx
@@ -42,5 +49,9 @@
LOG4CXX_LIST_DEF(HierarchyEventListenerList, HierarchyEventListenerPtr)
} // namespace spi
} // namespace log4cxx
+
+#if defined(_MSC_VER)
+#pragma warning ( pop )
+#endif
#endif //_LOG4CXX_SPI_HIERARCHY_EVENT_LISTENER_H
Modified: logging/log4cxx/trunk/src/main/include/log4cxx/spi/location/locationinfo.h
URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/main/include/log4cxx/spi/location/locationinfo.h?rev=613491&r1=613490&r2=613491&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/main/include/log4cxx/spi/location/locationinfo.h (original)
+++ logging/log4cxx/trunk/src/main/include/log4cxx/spi/location/locationinfo.h Sat Jan 19 17:21:13 2008
@@ -20,13 +20,10 @@
#include <log4cxx/log4cxx.h>
#include <string>
+#include <log4cxx/helpers/objectoutputstream.h>
namespace log4cxx
{
- namespace helpers {
- class ObjectOutputStream;
- class Pool;
- }
namespace spi
{
/**
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=613491&r1=613490&r2=613491&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/main/include/log4cxx/spi/loggerrepository.h (original)
+++ logging/log4cxx/trunk/src/main/include/log4cxx/spi/loggerrepository.h Sat Jan 19 17:21:13 2008
@@ -18,6 +18,12 @@
#ifndef _LOG4CXX_SPI_LOG_REPOSITORY_H
#define _LOG4CXX_SPI_LOG_REPOSITORY_H
+#if defined(_MSC_VER)
+#pragma warning ( push )
+#pragma warning ( disable: 4786 4231 )
+#endif
+
+
#include <log4cxx/appender.h>
#include <log4cxx/spi/loggerfactory.h>
#include <log4cxx/spi/hierarchyeventlistener.h>
@@ -103,5 +109,10 @@
} // namespace spi
} // namespace log4cxx
+
+#if defined(_MSC_VER)
+#pragma warning ( pop )
+#endif
+
#endif //_LOG4CXX_SPI_LOG_REPOSITORY_H
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=613491&r1=613490&r2=613491&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/main/include/log4cxx/spi/loggingevent.h (original)
+++ logging/log4cxx/trunk/src/main/include/log4cxx/spi/loggingevent.h Sat Jan 19 17:21:13 2008
@@ -18,6 +18,13 @@
#ifndef _LOG4CXX_SPI_LOGGING_EVENT_H
#define _LOG4CXX_SPI_LOGGING_EVENT_H
+#if defined(_MSC_VER)
+#pragma warning (push)
+#pragma warning (disable: 4786 4231)
+#endif
+
+
+
#include <log4cxx/helpers/objectptr.h>
#include <log4cxx/logstring.h>
#include <time.h>
@@ -263,5 +270,10 @@
LOG4CXX_LIST_DEF(LoggingEventList, LoggingEventPtr)
}
}
+
+#if defined(_MSC_VER)
+#pragma warning (pop)
+#endif
+
#endif //_LOG4CXX_SPI_LOGGING_EVENT_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=613491&r1=613490&r2=613491&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/main/include/log4cxx/xml/domconfigurator.h (original)
+++ logging/log4cxx/trunk/src/main/include/log4cxx/xml/domconfigurator.h Sat Jan 19 17:21:13 2008
@@ -18,6 +18,13 @@
#ifndef _LOG4CXX_XML_DOM_CONFIGURATOR_H
#define _LOG4CXX_XML_DOM_CONFIGURATOR_H
+#if defined(_MSC_VER)
+#pragma warning (push)
+#pragma warning (disable: 4786 4231)
+#endif
+
+
+
#include <log4cxx/logstring.h>
#include <log4cxx/helpers/objectptr.h>
#include <log4cxx/helpers/objectimpl.h>
@@ -332,5 +339,9 @@
};
} // namespace xml
} // namespace log4cxx
+
+#if defined(_MSC_VER)
+#pragma warning (pop)
+#endif
#endif // _LOG4CXX_XML_DOM_CONFIGURATOR_H