Author: tschoening
Date: Sun Jan 19 17:41:51 2014
New Revision: 1559537
URL: http://svn.apache.org/r1559537
Log:
Locationinfo for Borland C++ Builder and successors improved
Modified:
incubator/log4cxx/trunk/src/changes/changes.xml
incubator/log4cxx/trunk/src/main/include/log4cxx/spi/location/locationinfo.h
Modified: incubator/log4cxx/trunk/src/changes/changes.xml
URL:
http://svn.apache.org/viewvc/incubator/log4cxx/trunk/src/changes/changes.xml?rev=1559537&r1=1559536&r2=1559537&view=diff
==============================================================================
--- incubator/log4cxx/trunk/src/changes/changes.xml (original)
+++ incubator/log4cxx/trunk/src/changes/changes.xml Sun Jan 19 17:41:51 2014
@@ -66,6 +66,7 @@
<action type="change">Behavior of
StringHelper::startsWith and endsWith synced</action>
<action type="change">Documented C (class) and M
(method) log format keywords.</action>
+ <action type="add">Locationinfo for Borland C++ Builder
and successors improved</action>
</release>
<release version="0.10.0" date="2008-04-03" description="First
Apache release">
<action issue="LOGCXX-2" type="fix">logger.h includes
config.h</action>
Modified:
incubator/log4cxx/trunk/src/main/include/log4cxx/spi/location/locationinfo.h
URL:
http://svn.apache.org/viewvc/incubator/log4cxx/trunk/src/main/include/log4cxx/spi/location/locationinfo.h?rev=1559537&r1=1559536&r2=1559537&view=diff
==============================================================================
---
incubator/log4cxx/trunk/src/main/include/log4cxx/spi/location/locationinfo.h
(original)
+++
incubator/log4cxx/trunk/src/main/include/log4cxx/spi/location/locationinfo.h
Sun Jan 19 17:41:51 2014
@@ -109,28 +109,32 @@ namespace log4cxx
/** Caller's method name. */
const char * methodName;
-
+
};
}
}
- #if !defined(LOG4CXX_LOCATION)
-#if defined(_MSC_VER)
-#if _MSC_VER >= 1300
+#if !defined(LOG4CXX_LOCATION)
+ #if defined(_MSC_VER)
+ #if _MSC_VER >= 1300
#define __LOG4CXX_FUNC__ __FUNCSIG__
-#endif
-#else
-#if defined(__GNUC__)
+ #endif
+ #else
+ #if defined(__GNUC__)
#define __LOG4CXX_FUNC__ __PRETTY_FUNCTION__
-#endif
-#endif
-#if !defined(__LOG4CXX_FUNC__)
-#define __LOG4CXX_FUNC__ ""
-#endif
- #define LOG4CXX_LOCATION ::log4cxx::spi::LocationInfo(__FILE__, \
- __LOG4CXX_FUNC__,
\
- __LINE__)
+ #else
+ #if defined(__BORLANDC__)
+ #define __LOG4CXX_FUNC__ __FUNC__
+ #endif
+ #endif
+ #endif
+ #if !defined(__LOG4CXX_FUNC__)
+ #define __LOG4CXX_FUNC__ ""
#endif
+ #define LOG4CXX_LOCATION ::log4cxx::spi::LocationInfo(__FILE__, \
+ __LOG4CXX_FUNC__, \
+ __LINE__)
+#endif
#endif //_LOG4CXX_SPI_LOCATION_LOCATIONINFO_H
