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/30 10:10:34 UTC
svn commit: r616695 - in /logging/log4cxx/trunk/src/main: cpp/
include/log4cxx/ include/log4cxx/db/ include/log4cxx/filter/
include/log4cxx/helpers/ include/log4cxx/net/ include/log4cxx/nt/
include/log4cxx/pattern/ include/log4cxx/rolling/ include/log4...
Author: carnold
Date: Wed Jan 30 01:10:27 2008
New Revision: 616695
URL: http://svn.apache.org/viewvc?rev=616695&view=rev
Log:
LOGCXX-219: Replacing more ObjectPtrT
Modified:
logging/log4cxx/trunk/src/main/cpp/classnamepatternconverter.cpp
logging/log4cxx/trunk/src/main/cpp/datepatternconverter.cpp
logging/log4cxx/trunk/src/main/cpp/file.cpp
logging/log4cxx/trunk/src/main/cpp/filedatepatternconverter.cpp
logging/log4cxx/trunk/src/main/cpp/filelocationpatternconverter.cpp
logging/log4cxx/trunk/src/main/cpp/fixedwindowrollingpolicy.cpp
logging/log4cxx/trunk/src/main/cpp/fulllocationpatternconverter.cpp
logging/log4cxx/trunk/src/main/cpp/inetaddress.cpp
logging/log4cxx/trunk/src/main/cpp/integerpatternconverter.cpp
logging/log4cxx/trunk/src/main/cpp/levelpatternconverter.cpp
logging/log4cxx/trunk/src/main/cpp/linelocationpatternconverter.cpp
logging/log4cxx/trunk/src/main/cpp/lineseparatorpatternconverter.cpp
logging/log4cxx/trunk/src/main/cpp/literalpatternconverter.cpp
logging/log4cxx/trunk/src/main/cpp/loggerpatternconverter.cpp
logging/log4cxx/trunk/src/main/cpp/loggingeventpatternconverter.cpp
logging/log4cxx/trunk/src/main/cpp/messagepatternconverter.cpp
logging/log4cxx/trunk/src/main/cpp/methodlocationpatternconverter.cpp
logging/log4cxx/trunk/src/main/cpp/namepatternconverter.cpp
logging/log4cxx/trunk/src/main/cpp/ndcpatternconverter.cpp
logging/log4cxx/trunk/src/main/cpp/objectoutputstream.cpp
logging/log4cxx/trunk/src/main/cpp/patternconverter.cpp
logging/log4cxx/trunk/src/main/cpp/patternlayout.cpp
logging/log4cxx/trunk/src/main/cpp/propertiespatternconverter.cpp
logging/log4cxx/trunk/src/main/cpp/relativetimepatternconverter.cpp
logging/log4cxx/trunk/src/main/cpp/rollingpolicybase.cpp
logging/log4cxx/trunk/src/main/cpp/socketappender.cpp
logging/log4cxx/trunk/src/main/cpp/socketappenderskeleton.cpp
logging/log4cxx/trunk/src/main/cpp/sockethubappender.cpp
logging/log4cxx/trunk/src/main/cpp/syslogwriter.cpp
logging/log4cxx/trunk/src/main/cpp/threadpatternconverter.cpp
logging/log4cxx/trunk/src/main/cpp/throwableinformationpatternconverter.cpp
logging/log4cxx/trunk/src/main/cpp/timebasedrollingpolicy.cpp
logging/log4cxx/trunk/src/main/cpp/xmllayout.cpp
logging/log4cxx/trunk/src/main/include/log4cxx/db/odbcappender.h
logging/log4cxx/trunk/src/main/include/log4cxx/fileappender.h
logging/log4cxx/trunk/src/main/include/log4cxx/filter/denyallfilter.h
logging/log4cxx/trunk/src/main/include/log4cxx/filter/levelmatchfilter.h
logging/log4cxx/trunk/src/main/include/log4cxx/filter/levelrangefilter.h
logging/log4cxx/trunk/src/main/include/log4cxx/filter/stringmatchfilter.h
logging/log4cxx/trunk/src/main/include/log4cxx/helpers/datagrampacket.h
logging/log4cxx/trunk/src/main/include/log4cxx/helpers/datagramsocket.h
logging/log4cxx/trunk/src/main/include/log4cxx/helpers/date.h
logging/log4cxx/trunk/src/main/include/log4cxx/helpers/fileinputstream.h
logging/log4cxx/trunk/src/main/include/log4cxx/helpers/fileoutputstream.h
logging/log4cxx/trunk/src/main/include/log4cxx/helpers/inputstream.h
logging/log4cxx/trunk/src/main/include/log4cxx/helpers/inputstreamreader.h
logging/log4cxx/trunk/src/main/include/log4cxx/helpers/integer.h
logging/log4cxx/trunk/src/main/include/log4cxx/helpers/object.h
logging/log4cxx/trunk/src/main/include/log4cxx/helpers/propertyresourcebundle.h
logging/log4cxx/trunk/src/main/include/log4cxx/helpers/reader.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/net/smtpappender.h
logging/log4cxx/trunk/src/main/include/log4cxx/net/socketappender.h
logging/log4cxx/trunk/src/main/include/log4cxx/net/socketappenderskeleton.h
logging/log4cxx/trunk/src/main/include/log4cxx/net/sockethubappender.h
logging/log4cxx/trunk/src/main/include/log4cxx/net/syslogappender.h
logging/log4cxx/trunk/src/main/include/log4cxx/net/xmlsocketappender.h
logging/log4cxx/trunk/src/main/include/log4cxx/nt/nteventlogappender.h
logging/log4cxx/trunk/src/main/include/log4cxx/pattern/datepatternconverter.h
logging/log4cxx/trunk/src/main/include/log4cxx/pattern/formattinginfo.h
logging/log4cxx/trunk/src/main/include/log4cxx/pattern/integerpatternconverter.h
logging/log4cxx/trunk/src/main/include/log4cxx/pattern/loggingeventpatternconverter.h
logging/log4cxx/trunk/src/main/include/log4cxx/patternlayout.h
logging/log4cxx/trunk/src/main/include/log4cxx/rolling/filerenameaction.h
logging/log4cxx/trunk/src/main/include/log4cxx/rolling/filterbasedtriggeringpolicy.h
logging/log4cxx/trunk/src/main/include/log4cxx/rolling/fixedwindowrollingpolicy.h
logging/log4cxx/trunk/src/main/include/log4cxx/rolling/gzcompressaction.h
logging/log4cxx/trunk/src/main/include/log4cxx/rolling/rolloverdescription.h
logging/log4cxx/trunk/src/main/include/log4cxx/rolling/sizebasedtriggeringpolicy.h
logging/log4cxx/trunk/src/main/include/log4cxx/rolling/timebasedrollingpolicy.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/hierarchyeventlistener.h
logging/log4cxx/trunk/src/main/include/log4cxx/spi/loggerrepository.h
logging/log4cxx/trunk/src/main/include/log4cxx/spi/repositoryselector.h
logging/log4cxx/trunk/src/main/include/log4cxx/spi/triggeringeventevaluator.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/main/include/log4cxx/xml/xmllayout.h
Modified: logging/log4cxx/trunk/src/main/cpp/classnamepatternconverter.cpp
URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/main/cpp/classnamepatternconverter.cpp?rev=616695&r1=616694&r2=616695&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/main/cpp/classnamepatternconverter.cpp (original)
+++ logging/log4cxx/trunk/src/main/cpp/classnamepatternconverter.cpp Wed Jan 30 01:10:27 2008
@@ -14,6 +14,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
+#if defined(_MSC_VER)
+#pragma warning ( push )
+#pragma warning ( disable: 4786 4231 )
+#endif
+
#include <log4cxx/logstring.h>
#include <log4cxx/pattern/classnamepatternconverter.h>
#include <log4cxx/spi/loggingevent.h>
Modified: logging/log4cxx/trunk/src/main/cpp/datepatternconverter.cpp
URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/main/cpp/datepatternconverter.cpp?rev=616695&r1=616694&r2=616695&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/main/cpp/datepatternconverter.cpp (original)
+++ logging/log4cxx/trunk/src/main/cpp/datepatternconverter.cpp Wed Jan 30 01:10:27 2008
@@ -15,6 +15,10 @@
* limitations under the License.
*/
+#if defined(_MSC_VER)
+#pragma warning ( push )
+#pragma warning ( disable: 4786 4231 )
+#endif
#include <log4cxx/logstring.h>
#include <log4cxx/pattern/datepatternconverter.h>
Modified: logging/log4cxx/trunk/src/main/cpp/file.cpp
URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/main/cpp/file.cpp?rev=616695&r1=616694&r2=616695&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/main/cpp/file.cpp (original)
+++ logging/log4cxx/trunk/src/main/cpp/file.cpp Wed Jan 30 01:10:27 2008
@@ -84,7 +84,7 @@
File& File::setName(const LogString& newName) {
name.assign(newName);
- osName.clear();
+ osName.erase();
Transcoder::encode(newName, osName);
return *this;
}
Modified: logging/log4cxx/trunk/src/main/cpp/filedatepatternconverter.cpp
URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/main/cpp/filedatepatternconverter.cpp?rev=616695&r1=616694&r2=616695&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/main/cpp/filedatepatternconverter.cpp (original)
+++ logging/log4cxx/trunk/src/main/cpp/filedatepatternconverter.cpp Wed Jan 30 01:10:27 2008
@@ -14,6 +14,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+#if defined(_MSC_VER)
+#pragma warning ( push )
+#pragma warning ( disable: 4786 4231 )
+#endif
#include <log4cxx/logstring.h>
#include <log4cxx/pattern/filedatepatternconverter.h>
Modified: logging/log4cxx/trunk/src/main/cpp/filelocationpatternconverter.cpp
URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/main/cpp/filelocationpatternconverter.cpp?rev=616695&r1=616694&r2=616695&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/main/cpp/filelocationpatternconverter.cpp (original)
+++ logging/log4cxx/trunk/src/main/cpp/filelocationpatternconverter.cpp Wed Jan 30 01:10:27 2008
@@ -14,6 +14,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+#if defined(_MSC_VER)
+#pragma warning ( push )
+#pragma warning ( disable: 4786 4231 )
+#endif
+
+
#include <log4cxx/logstring.h>
#include <log4cxx/pattern/filelocationpatternconverter.h>
#include <log4cxx/spi/loggingevent.h>
Modified: logging/log4cxx/trunk/src/main/cpp/fixedwindowrollingpolicy.cpp
URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/main/cpp/fixedwindowrollingpolicy.cpp?rev=616695&r1=616694&r2=616695&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/main/cpp/fixedwindowrollingpolicy.cpp (original)
+++ logging/log4cxx/trunk/src/main/cpp/fixedwindowrollingpolicy.cpp Wed Jan 30 01:10:27 2008
@@ -14,6 +14,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+#if defined(_MSC_VER)
+#pragma warning ( push )
+#pragma warning ( disable: 4503 4786 4231 )
+#endif
+
+
#include <log4cxx/logstring.h>
#include <log4cxx/rolling/fixedwindowrollingpolicy.h>
#include <log4cxx/helpers/pool.h>
Modified: logging/log4cxx/trunk/src/main/cpp/fulllocationpatternconverter.cpp
URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/main/cpp/fulllocationpatternconverter.cpp?rev=616695&r1=616694&r2=616695&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/main/cpp/fulllocationpatternconverter.cpp (original)
+++ logging/log4cxx/trunk/src/main/cpp/fulllocationpatternconverter.cpp Wed Jan 30 01:10:27 2008
@@ -15,6 +15,11 @@
* limitations under the License.
*/
+#if defined(_MSC_VER)
+#pragma warning ( push )
+#pragma warning ( disable: 4786 4231 )
+#endif
+
#include <log4cxx/logstring.h>
#include <log4cxx/pattern/fulllocationpatternconverter.h>
#include <log4cxx/spi/loggingevent.h>
Modified: logging/log4cxx/trunk/src/main/cpp/inetaddress.cpp
URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/main/cpp/inetaddress.cpp?rev=616695&r1=616694&r2=616695&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/main/cpp/inetaddress.cpp (original)
+++ logging/log4cxx/trunk/src/main/cpp/inetaddress.cpp Wed Jan 30 01:10:27 2008
@@ -14,6 +14,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+#if defined(_MSC_VER)
+#pragma warning ( push )
+#pragma warning ( disable: 4786 4231 )
+#endif
#include <log4cxx/logstring.h>
#include <log4cxx/helpers/inetaddress.h>
Modified: logging/log4cxx/trunk/src/main/cpp/integerpatternconverter.cpp
URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/main/cpp/integerpatternconverter.cpp?rev=616695&r1=616694&r2=616695&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/main/cpp/integerpatternconverter.cpp (original)
+++ logging/log4cxx/trunk/src/main/cpp/integerpatternconverter.cpp Wed Jan 30 01:10:27 2008
@@ -14,6 +14,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+#if defined(_MSC_VER)
+#pragma warning ( push )
+#pragma warning ( disable: 4786 4231 )
+#endif
#include <log4cxx/logstring.h>
Modified: logging/log4cxx/trunk/src/main/cpp/levelpatternconverter.cpp
URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/main/cpp/levelpatternconverter.cpp?rev=616695&r1=616694&r2=616695&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/main/cpp/levelpatternconverter.cpp (original)
+++ logging/log4cxx/trunk/src/main/cpp/levelpatternconverter.cpp Wed Jan 30 01:10:27 2008
@@ -14,6 +14,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+#if defined(_MSC_VER)
+#pragma warning ( push )
+#pragma warning ( disable: 4786 4231 )
+#endif
#include <log4cxx/logstring.h>
#include <log4cxx/pattern/levelpatternconverter.h>
Modified: logging/log4cxx/trunk/src/main/cpp/linelocationpatternconverter.cpp
URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/main/cpp/linelocationpatternconverter.cpp?rev=616695&r1=616694&r2=616695&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/main/cpp/linelocationpatternconverter.cpp (original)
+++ logging/log4cxx/trunk/src/main/cpp/linelocationpatternconverter.cpp Wed Jan 30 01:10:27 2008
@@ -14,6 +14,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+#if defined(_MSC_VER)
+#pragma warning ( push )
+#pragma warning ( disable: 4786 4231 )
+#endif
#include <log4cxx/logstring.h>
#include <log4cxx/pattern/linelocationpatternconverter.h>
Modified: logging/log4cxx/trunk/src/main/cpp/lineseparatorpatternconverter.cpp
URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/main/cpp/lineseparatorpatternconverter.cpp?rev=616695&r1=616694&r2=616695&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/main/cpp/lineseparatorpatternconverter.cpp (original)
+++ logging/log4cxx/trunk/src/main/cpp/lineseparatorpatternconverter.cpp Wed Jan 30 01:10:27 2008
@@ -14,6 +14,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+#if defined(_MSC_VER)
+#pragma warning ( push )
+#pragma warning ( disable: 4786 4231 )
+#endif
#include <log4cxx/logstring.h>
Modified: logging/log4cxx/trunk/src/main/cpp/literalpatternconverter.cpp
URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/main/cpp/literalpatternconverter.cpp?rev=616695&r1=616694&r2=616695&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/main/cpp/literalpatternconverter.cpp (original)
+++ logging/log4cxx/trunk/src/main/cpp/literalpatternconverter.cpp Wed Jan 30 01:10:27 2008
@@ -14,6 +14,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+#if defined(_MSC_VER)
+#pragma warning ( push )
+#pragma warning ( disable: 4786 4231 )
+#endif
#include <log4cxx/logstring.h>
#include <log4cxx/pattern/literalpatternconverter.h>
Modified: logging/log4cxx/trunk/src/main/cpp/loggerpatternconverter.cpp
URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/main/cpp/loggerpatternconverter.cpp?rev=616695&r1=616694&r2=616695&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/main/cpp/loggerpatternconverter.cpp (original)
+++ logging/log4cxx/trunk/src/main/cpp/loggerpatternconverter.cpp Wed Jan 30 01:10:27 2008
@@ -14,6 +14,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+#if defined(_MSC_VER)
+#pragma warning ( push )
+#pragma warning ( disable: 4786 4231 )
+#endif
#include <log4cxx/logstring.h>
#include <log4cxx/pattern/loggerpatternconverter.h>
Modified: logging/log4cxx/trunk/src/main/cpp/loggingeventpatternconverter.cpp
URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/main/cpp/loggingeventpatternconverter.cpp?rev=616695&r1=616694&r2=616695&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/main/cpp/loggingeventpatternconverter.cpp (original)
+++ logging/log4cxx/trunk/src/main/cpp/loggingeventpatternconverter.cpp Wed Jan 30 01:10:27 2008
@@ -14,6 +14,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+#if defined(_MSC_VER)
+#pragma warning ( push )
+#pragma warning ( disable: 4786 4231 )
+#endif
+
#include <log4cxx/logstring.h>
#include <log4cxx/pattern/loggingeventpatternconverter.h>
#include <log4cxx/spi/loggingevent.h>
Modified: logging/log4cxx/trunk/src/main/cpp/messagepatternconverter.cpp
URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/main/cpp/messagepatternconverter.cpp?rev=616695&r1=616694&r2=616695&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/main/cpp/messagepatternconverter.cpp (original)
+++ logging/log4cxx/trunk/src/main/cpp/messagepatternconverter.cpp Wed Jan 30 01:10:27 2008
@@ -14,6 +14,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+#if defined(_MSC_VER)
+#pragma warning ( push )
+#pragma warning ( disable: 4786 4231 )
+#endif
Modified: logging/log4cxx/trunk/src/main/cpp/methodlocationpatternconverter.cpp
URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/main/cpp/methodlocationpatternconverter.cpp?rev=616695&r1=616694&r2=616695&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/main/cpp/methodlocationpatternconverter.cpp (original)
+++ logging/log4cxx/trunk/src/main/cpp/methodlocationpatternconverter.cpp Wed Jan 30 01:10:27 2008
@@ -14,6 +14,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+#if defined(_MSC_VER)
+#pragma warning ( push )
+#pragma warning ( disable: 4786 4231 )
+#endif
Modified: logging/log4cxx/trunk/src/main/cpp/namepatternconverter.cpp
URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/main/cpp/namepatternconverter.cpp?rev=616695&r1=616694&r2=616695&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/main/cpp/namepatternconverter.cpp (original)
+++ logging/log4cxx/trunk/src/main/cpp/namepatternconverter.cpp Wed Jan 30 01:10:27 2008
@@ -14,6 +14,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
+#if defined(_MSC_VER)
+#pragma warning ( push )
+#pragma warning ( disable: 4786 4231 )
+#endif
+
#include <log4cxx/logstring.h>
#include <log4cxx/pattern/namepatternconverter.h>
#include <log4cxx/pattern/nameabbreviator.h>
Modified: logging/log4cxx/trunk/src/main/cpp/ndcpatternconverter.cpp
URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/main/cpp/ndcpatternconverter.cpp?rev=616695&r1=616694&r2=616695&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/main/cpp/ndcpatternconverter.cpp (original)
+++ logging/log4cxx/trunk/src/main/cpp/ndcpatternconverter.cpp Wed Jan 30 01:10:27 2008
@@ -15,6 +15,10 @@
* limitations under the License.
*/
+#if defined(_MSC_VER)
+#pragma warning ( push )
+#pragma warning ( disable: 4786 4231 )
+#endif
Modified: logging/log4cxx/trunk/src/main/cpp/objectoutputstream.cpp
URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/main/cpp/objectoutputstream.cpp?rev=616695&r1=616694&r2=616695&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/main/cpp/objectoutputstream.cpp (original)
+++ logging/log4cxx/trunk/src/main/cpp/objectoutputstream.cpp Wed Jan 30 01:10:27 2008
@@ -14,6 +14,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+#if defined(_MSC_VER)
+#pragma warning ( push )
+#pragma warning ( disable: 4786 4231 )
+#endif
#include <log4cxx/logstring.h>
#include <log4cxx/helpers/objectoutputstream.h>
Modified: logging/log4cxx/trunk/src/main/cpp/patternconverter.cpp
URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/main/cpp/patternconverter.cpp?rev=616695&r1=616694&r2=616695&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/main/cpp/patternconverter.cpp (original)
+++ logging/log4cxx/trunk/src/main/cpp/patternconverter.cpp Wed Jan 30 01:10:27 2008
@@ -14,6 +14,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+#if defined(_MSC_VER)
+#pragma warning ( push )
+#pragma warning ( disable: 4786 4231 )
+#endif
#include <log4cxx/logstring.h>
#include <log4cxx/pattern/patternconverter.h>
Modified: logging/log4cxx/trunk/src/main/cpp/patternlayout.cpp
URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/main/cpp/patternlayout.cpp?rev=616695&r1=616694&r2=616695&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/main/cpp/patternlayout.cpp (original)
+++ logging/log4cxx/trunk/src/main/cpp/patternlayout.cpp Wed Jan 30 01:10:27 2008
@@ -14,6 +14,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+#if defined(_MSC_VER)
+#pragma warning ( push )
+#pragma warning ( disable: 4786 4231 )
+#endif
#include <log4cxx/logstring.h>
#include <log4cxx/patternlayout.h>
Modified: logging/log4cxx/trunk/src/main/cpp/propertiespatternconverter.cpp
URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/main/cpp/propertiespatternconverter.cpp?rev=616695&r1=616694&r2=616695&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/main/cpp/propertiespatternconverter.cpp (original)
+++ logging/log4cxx/trunk/src/main/cpp/propertiespatternconverter.cpp Wed Jan 30 01:10:27 2008
@@ -15,6 +15,10 @@
* limitations under the License.
*/
+#if defined(_MSC_VER)
+#pragma warning ( push )
+#pragma warning ( disable: 4786 4231 )
+#endif
#include <log4cxx/logstring.h>
#include <log4cxx/pattern/propertiespatternconverter.h>
Modified: logging/log4cxx/trunk/src/main/cpp/relativetimepatternconverter.cpp
URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/main/cpp/relativetimepatternconverter.cpp?rev=616695&r1=616694&r2=616695&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/main/cpp/relativetimepatternconverter.cpp (original)
+++ logging/log4cxx/trunk/src/main/cpp/relativetimepatternconverter.cpp Wed Jan 30 01:10:27 2008
@@ -14,6 +14,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+#if defined(_MSC_VER)
+#pragma warning ( push )
+#pragma warning ( disable: 4786 4231 )
+#endif
#include <log4cxx/logstring.h>
Modified: logging/log4cxx/trunk/src/main/cpp/rollingpolicybase.cpp
URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/main/cpp/rollingpolicybase.cpp?rev=616695&r1=616694&r2=616695&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/main/cpp/rollingpolicybase.cpp (original)
+++ logging/log4cxx/trunk/src/main/cpp/rollingpolicybase.cpp Wed Jan 30 01:10:27 2008
@@ -14,6 +14,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+#if defined(_MSC_VER)
+#pragma warning ( push )
+#pragma warning ( disable: 4786 4231 )
+#endif
+
+
#include <log4cxx/logstring.h>
#include <log4cxx/rolling/rollingpolicybase.h>
#include <log4cxx/pattern/formattinginfo.h>
Modified: logging/log4cxx/trunk/src/main/cpp/socketappender.cpp
URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/main/cpp/socketappender.cpp?rev=616695&r1=616694&r2=616695&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/main/cpp/socketappender.cpp (original)
+++ logging/log4cxx/trunk/src/main/cpp/socketappender.cpp Wed Jan 30 01:10:27 2008
@@ -14,6 +14,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+#if defined(_MSC_VER)
+#pragma warning ( push )
+#pragma warning ( disable: 4786 4231 )
+#endif
#include <log4cxx/net/socketappender.h>
#include <log4cxx/helpers/loglog.h>
Modified: logging/log4cxx/trunk/src/main/cpp/socketappenderskeleton.cpp
URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/main/cpp/socketappenderskeleton.cpp?rev=616695&r1=616694&r2=616695&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/main/cpp/socketappenderskeleton.cpp (original)
+++ logging/log4cxx/trunk/src/main/cpp/socketappenderskeleton.cpp Wed Jan 30 01:10:27 2008
@@ -14,6 +14,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+#if defined(_MSC_VER)
+#pragma warning ( push )
+#pragma warning ( disable: 4786 4231 )
+#endif
#define __STDC_CONSTANT_MACROS
#include <log4cxx/net/socketappenderskeleton.h>
Modified: logging/log4cxx/trunk/src/main/cpp/sockethubappender.cpp
URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/main/cpp/sockethubappender.cpp?rev=616695&r1=616694&r2=616695&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/main/cpp/sockethubappender.cpp (original)
+++ logging/log4cxx/trunk/src/main/cpp/sockethubappender.cpp Wed Jan 30 01:10:27 2008
@@ -14,6 +14,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+#if defined(_MSC_VER)
+#pragma warning ( push )
+#pragma warning ( disable: 4786 4231 )
+#endif
#include <log4cxx/net/sockethubappender.h>
Modified: logging/log4cxx/trunk/src/main/cpp/syslogwriter.cpp
URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/main/cpp/syslogwriter.cpp?rev=616695&r1=616694&r2=616695&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/main/cpp/syslogwriter.cpp (original)
+++ logging/log4cxx/trunk/src/main/cpp/syslogwriter.cpp Wed Jan 30 01:10:27 2008
@@ -14,6 +14,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+#if defined(_MSC_VER)
+#pragma warning ( push )
+#pragma warning ( disable: 4786 4231 )
+#endif
#include <log4cxx/logstring.h>
#include <log4cxx/helpers/syslogwriter.h>
Modified: logging/log4cxx/trunk/src/main/cpp/threadpatternconverter.cpp
URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/main/cpp/threadpatternconverter.cpp?rev=616695&r1=616694&r2=616695&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/main/cpp/threadpatternconverter.cpp (original)
+++ logging/log4cxx/trunk/src/main/cpp/threadpatternconverter.cpp Wed Jan 30 01:10:27 2008
@@ -14,6 +14,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+#if defined(_MSC_VER)
+#pragma warning ( push )
+#pragma warning ( disable: 4786 4231 )
+#endif
#include <log4cxx/logstring.h>
#include <log4cxx/pattern/threadpatternconverter.h>
Modified: logging/log4cxx/trunk/src/main/cpp/throwableinformationpatternconverter.cpp
URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/main/cpp/throwableinformationpatternconverter.cpp?rev=616695&r1=616694&r2=616695&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/main/cpp/throwableinformationpatternconverter.cpp (original)
+++ logging/log4cxx/trunk/src/main/cpp/throwableinformationpatternconverter.cpp Wed Jan 30 01:10:27 2008
@@ -14,6 +14,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+#if defined(_MSC_VER)
+#pragma warning ( push )
+#pragma warning ( disable: 4786 4231 )
+#endif
Modified: logging/log4cxx/trunk/src/main/cpp/timebasedrollingpolicy.cpp
URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/main/cpp/timebasedrollingpolicy.cpp?rev=616695&r1=616694&r2=616695&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/main/cpp/timebasedrollingpolicy.cpp (original)
+++ logging/log4cxx/trunk/src/main/cpp/timebasedrollingpolicy.cpp Wed Jan 30 01:10:27 2008
@@ -14,6 +14,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+#if defined(_MSC_VER)
+#pragma warning ( push )
+#pragma warning ( disable: 4786 4231 )
+#endif
#include <log4cxx/logstring.h>
#include <log4cxx/rolling/timebasedrollingpolicy.h>
Modified: logging/log4cxx/trunk/src/main/cpp/xmllayout.cpp
URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/main/cpp/xmllayout.cpp?rev=616695&r1=616694&r2=616695&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/main/cpp/xmllayout.cpp (original)
+++ logging/log4cxx/trunk/src/main/cpp/xmllayout.cpp Wed Jan 30 01:10:27 2008
@@ -120,10 +120,10 @@
output.append(LOG4CXX_EOL);
}
}
- for (LoggingEvent::KeySet::const_iterator i = propertySet.begin();
- i != propertySet.end();
- i++) {
- LogString key(*i);
+ for (LoggingEvent::KeySet::const_iterator i2 = propertySet.begin();
+ i2 != propertySet.end();
+ i2++) {
+ LogString key(*i2);
LogString value;
if(event->getProperty(key, value)) {
output.append(LOG4CXX_STR("<log4j:data name=\""));
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=616695&r1=616694&r2=616695&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/main/include/log4cxx/db/odbcappender.h (original)
+++ logging/log4cxx/trunk/src/main/include/log4cxx/db/odbcappender.h Wed Jan 30 01:10:27 2008
@@ -274,7 +274,7 @@
ODBCAppender(const ODBCAppender&);
ODBCAppender& operator=(const ODBCAppender&);
}; // class ODBCAppender
- typedef helpers::ObjectPtrT<ODBCAppender> ODBCAppenderPtr;
+ LOG4CXX_PTR_DEF(ODBCAppender);
} // namespace db
} // namespace log4cxx
Modified: logging/log4cxx/trunk/src/main/include/log4cxx/fileappender.h
URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/main/include/log4cxx/fileappender.h?rev=616695&r1=616694&r2=616695&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/main/include/log4cxx/fileappender.h (original)
+++ logging/log4cxx/trunk/src/main/include/log4cxx/fileappender.h Wed Jan 30 01:10:27 2008
@@ -215,7 +215,7 @@
FileAppender& operator=(const FileAppender&);
}; // class FileAppender
- typedef helpers::ObjectPtrT<FileAppender> FileAppenderPtr;
+ LOG4CXX_PTR_DEF(FileAppender);
} // namespace log4cxx
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=616695&r1=616694&r2=616695&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/main/include/log4cxx/filter/denyallfilter.h (original)
+++ logging/log4cxx/trunk/src/main/include/log4cxx/filter/denyallfilter.h Wed Jan 30 01:10:27 2008
@@ -55,7 +55,7 @@
{ return spi::Filter::DENY; }
}; // class DenyAllFilter
- typedef helpers::ObjectPtrT<DenyAllFilter> DenyAllFilterPtr;
+ LOG4CXX_PTR_DEF(DenyAllFilter);
} // namespace filter
} // namespace log4cxx
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=616695&r1=616694&r2=616695&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/main/include/log4cxx/filter/levelmatchfilter.h (original)
+++ logging/log4cxx/trunk/src/main/include/log4cxx/filter/levelmatchfilter.h Wed Jan 30 01:10:27 2008
@@ -39,8 +39,6 @@
then {@link spi::Filter#DENY DENY} is returned. If there is no match,
{@link spi::Filter#NEUTRAL NEUTRAL} is returned.
*/
- class LevelMatchFilter;
- typedef helpers::ObjectPtrT<LevelMatchFilter> LevelMatchFilterPtr;
class LOG4CXX_EXPORT LevelMatchFilter : public spi::Filter
{
@@ -87,6 +85,7 @@
*/
FilterDecision decide(const spi::LoggingEventPtr& event) const;
}; // class LevelMatchFilter
+ LOG4CXX_PTR_DEF(LevelMatchFilter);
} // namespace filter
} // namespace log4cxx
Modified: logging/log4cxx/trunk/src/main/include/log4cxx/filter/levelrangefilter.h
URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/main/include/log4cxx/filter/levelrangefilter.h?rev=616695&r1=616694&r2=616695&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/main/include/log4cxx/filter/levelrangefilter.h (original)
+++ logging/log4cxx/trunk/src/main/include/log4cxx/filter/levelrangefilter.h Wed Jan 30 01:10:27 2008
@@ -53,8 +53,6 @@
AppenderSkeleton for a more convenient way to
filter out events by level.
*/
- class LevelRangeFilter;
- typedef helpers::ObjectPtrT<LevelRangeFilter> LevelRangeFilterPtr;
class LOG4CXX_EXPORT LevelRangeFilter : public spi::Filter
{
@@ -131,7 +129,8 @@
<b>AcceptOnMatch</b> property is set to false.
*/
FilterDecision decide(const spi::LoggingEventPtr& event) const;
- }; // class LevelMatchFilter
+ }; // class LevelRangeFilter
+ LOG4CXX_PTR_DEF(LevelRangeFilter);
} // namespace filter
} // namespace log4cxx
Modified: logging/log4cxx/trunk/src/main/include/log4cxx/filter/stringmatchfilter.h
URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/main/include/log4cxx/filter/stringmatchfilter.h?rev=616695&r1=616694&r2=616695&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/main/include/log4cxx/filter/stringmatchfilter.h (original)
+++ logging/log4cxx/trunk/src/main/include/log4cxx/filter/stringmatchfilter.h Wed Jan 30 01:10:27 2008
@@ -45,9 +45,6 @@
seeting up a <code>StringMatchFilter</code>.
*/
- class StringMatchFilter;
- typedef helpers::ObjectPtrT<StringMatchFilter> StringMatchFilterPtr;
-
class LOG4CXX_EXPORT StringMatchFilter : public spi::Filter
{
private:
@@ -88,6 +85,7 @@
*/
FilterDecision decide(const spi::LoggingEventPtr& event) const;
}; // class StringMatchFilter
+ LOG4CXX_PTR_DEF(StringMatchFilter);
} // namespace filter
} // namespace log4cxx
Modified: logging/log4cxx/trunk/src/main/include/log4cxx/helpers/datagrampacket.h
URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/main/include/log4cxx/helpers/datagrampacket.h?rev=616695&r1=616694&r2=616695&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/main/include/log4cxx/helpers/datagrampacket.h (original)
+++ logging/log4cxx/trunk/src/main/include/log4cxx/helpers/datagrampacket.h Wed Jan 30 01:10:27 2008
@@ -26,8 +26,6 @@
{
namespace helpers
{
- class DatagramPacket;
- typedef helpers::ObjectPtrT<DatagramPacket> DatagramPacketPtr;
/** This class represents a datagram packet.
<p>Datagram packets are used to implement a connectionless packet
@@ -129,8 +127,9 @@
DatagramPacket(const DatagramPacket&);
DatagramPacket& operator=(const DatagramPacket&);
- }; // class DatagramSocketImpl
+ }; // class DatagramPacket
+ LOG4CXX_PTR_DEF(DatagramPacket);
} // namespace helpers
} // namespace log4cxx
-#endif // _LOG4CXX_HELPERS_DATAGRAM_SOCKET_IMPL
+#endif // _LOG4CXX_HELPERS_DATAGRAM_PACKET
Modified: logging/log4cxx/trunk/src/main/include/log4cxx/helpers/datagramsocket.h
URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/main/include/log4cxx/helpers/datagramsocket.h?rev=616695&r1=616694&r2=616695&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/main/include/log4cxx/helpers/datagramsocket.h (original)
+++ logging/log4cxx/trunk/src/main/include/log4cxx/helpers/datagramsocket.h Wed Jan 30 01:10:27 2008
@@ -22,7 +22,7 @@
#include <log4cxx/helpers/objectptr.h>
#include <log4cxx/helpers/inetaddress.h>
#include <log4cxx/helpers/pool.h>
-
+#include <log4cxx/helpers/datagrampacket.h>
extern "C" { struct apr_socket_t; }
@@ -30,12 +30,6 @@
{
namespace helpers
{
- class DatagramPacket;
- typedef helpers::ObjectPtrT<DatagramPacket> DatagramPacketPtr;
-
- class DatagramSocket;
- typedef helpers::ObjectPtrT<DatagramSocket> DatagramSocketPtr;
-
/** This class represents a socket for sending and receiving
datagram packets.*/
class LOG4CXX_EXPORT DatagramSocket : public helpers::ObjectImpl
@@ -127,6 +121,7 @@
int localPort;
};
+ LOG4CXX_PTR_DEF(DatagramSocket);
} // namespace helpers
} // namespace log4cxx
Modified: logging/log4cxx/trunk/src/main/include/log4cxx/helpers/date.h
URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/main/include/log4cxx/helpers/date.h?rev=616695&r1=616694&r2=616695&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/main/include/log4cxx/helpers/date.h (original)
+++ logging/log4cxx/trunk/src/main/include/log4cxx/helpers/date.h Wed Jan 30 01:10:27 2008
@@ -58,7 +58,7 @@
};
- typedef log4cxx::helpers::ObjectPtrT<Date> DatePtr;
+ LOG4CXX_PTR_DEF(Date);
}
}
Modified: logging/log4cxx/trunk/src/main/include/log4cxx/helpers/fileinputstream.h
URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/main/include/log4cxx/helpers/fileinputstream.h?rev=616695&r1=616694&r2=616695&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/main/include/log4cxx/helpers/fileinputstream.h (original)
+++ logging/log4cxx/trunk/src/main/include/log4cxx/helpers/fileinputstream.h Wed Jan 30 01:10:27 2008
@@ -86,7 +86,7 @@
};
- typedef helpers::ObjectPtrT<FileInputStream> FileInputStreamPtr;
+ LOG4CXX_PTR_DEF(FileInputStream);
} // namespace helpers
} //namespace log4cxx
Modified: logging/log4cxx/trunk/src/main/include/log4cxx/helpers/fileoutputstream.h
URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/main/include/log4cxx/helpers/fileoutputstream.h?rev=616695&r1=616694&r2=616695&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/main/include/log4cxx/helpers/fileoutputstream.h (original)
+++ logging/log4cxx/trunk/src/main/include/log4cxx/helpers/fileoutputstream.h Wed Jan 30 01:10:27 2008
@@ -56,7 +56,7 @@
FileOutputStream& operator=(const FileOutputStream&);
};
- typedef helpers::ObjectPtrT<FileOutputStream> FileOutputStreamPtr;
+ LOG4CXX_PTR_DEF(FileOutputStream);
} // namespace helpers
} //namespace log4cxx
Modified: logging/log4cxx/trunk/src/main/include/log4cxx/helpers/inputstream.h
URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/main/include/log4cxx/helpers/inputstream.h?rev=616695&r1=616694&r2=616695&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/main/include/log4cxx/helpers/inputstream.h (original)
+++ logging/log4cxx/trunk/src/main/include/log4cxx/helpers/inputstream.h Wed Jan 30 01:10:27 2008
@@ -64,7 +64,7 @@
InputStream& operator=(const InputStream&);
};
- typedef helpers::ObjectPtrT<InputStream> InputStreamPtr;
+ LOG4CXX_PTR_DEF(InputStream);
} // namespace helpers
} //namespace log4cxx
Modified: logging/log4cxx/trunk/src/main/include/log4cxx/helpers/inputstreamreader.h
URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/main/include/log4cxx/helpers/inputstreamreader.h?rev=616695&r1=616694&r2=616695&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/main/include/log4cxx/helpers/inputstreamreader.h (original)
+++ logging/log4cxx/trunk/src/main/include/log4cxx/helpers/inputstreamreader.h Wed Jan 30 01:10:27 2008
@@ -86,7 +86,7 @@
InputStreamReader& operator=(const InputStreamReader&);
};
- typedef helpers::ObjectPtrT<InputStreamReader> InputStreamReaderPtr;
+ LOG4CXX_PTR_DEF(InputStreamReader);
} // namespace helpers
} //namespace log4cxx
Modified: logging/log4cxx/trunk/src/main/include/log4cxx/helpers/integer.h
URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/main/include/log4cxx/helpers/integer.h?rev=616695&r1=616694&r2=616695&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/main/include/log4cxx/helpers/integer.h (original)
+++ logging/log4cxx/trunk/src/main/include/log4cxx/helpers/integer.h Wed Jan 30 01:10:27 2008
@@ -41,7 +41,7 @@
};
- typedef log4cxx::helpers::ObjectPtrT<Integer> IntegerPtr;
+ LOG4CXX_PTR_DEF(Integer);
}
}
Modified: logging/log4cxx/trunk/src/main/include/log4cxx/helpers/object.h
URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/main/include/log4cxx/helpers/object.h?rev=616695&r1=616694&r2=616695&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/main/include/log4cxx/helpers/object.h (original)
+++ logging/log4cxx/trunk/src/main/include/log4cxx/helpers/object.h Wed Jan 30 01:10:27 2008
@@ -96,11 +96,7 @@
namespace helpers
{
-
- class Object;
- typedef ObjectPtrT<Object> ObjectPtr;
-
- class Pool;
+ class Pool;
/** base class for java-like objects.*/
class LOG4CXX_EXPORT Object
@@ -113,7 +109,7 @@
virtual bool instanceof(const Class& clazz) const = 0;
virtual const void * cast(const Class& clazz) const = 0;
};
-
+ LOG4CXX_PTR_DEF(Object);
}
}
Modified: logging/log4cxx/trunk/src/main/include/log4cxx/helpers/propertyresourcebundle.h
URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/main/include/log4cxx/helpers/propertyresourcebundle.h?rev=616695&r1=616694&r2=616695&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/main/include/log4cxx/helpers/propertyresourcebundle.h (original)
+++ logging/log4cxx/trunk/src/main/include/log4cxx/helpers/propertyresourcebundle.h Wed Jan 30 01:10:27 2008
@@ -26,8 +26,6 @@
{
namespace helpers
{
- class PropertyResourceBundle;
- typedef ObjectPtrT<PropertyResourceBundle> PropertyResourceBundlePtr;
/**
PropertyResourceBundle is a concrete subclass of ResourceBundle that
@@ -56,6 +54,7 @@
protected:
Properties properties;
}; // class PropertyResourceBundle
+ LOG4CXX_PTR_DEF(PropertyResourceBundle);
} // namespace helpers
} // namespace log4cxx
Modified: logging/log4cxx/trunk/src/main/include/log4cxx/helpers/reader.h
URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/main/include/log4cxx/helpers/reader.h?rev=616695&r1=616694&r2=616695&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/main/include/log4cxx/helpers/reader.h (original)
+++ logging/log4cxx/trunk/src/main/include/log4cxx/helpers/reader.h Wed Jan 30 01:10:27 2008
@@ -64,7 +64,7 @@
Reader& operator=(const Reader&);
};
- typedef helpers::ObjectPtrT<Reader> ReaderPtr;
+ LOG4CXX_PTR_DEF(Reader);
} // namespace helpers
} //namespace log4cxx
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=616695&r1=616694&r2=616695&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/main/include/log4cxx/helpers/xml.h (original)
+++ logging/log4cxx/trunk/src/main/include/log4cxx/helpers/xml.h Wed Jan 30 01:10:27 2008
@@ -18,6 +18,12 @@
#ifndef _LOG4CXX_HELPERS_XML_H
#define _LOG4CXX_HELPERS_XML_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/object.h>
@@ -34,9 +40,6 @@
class XMLDOMDocument;
typedef helpers::ObjectPtrT<XMLDOMDocument> XMLDOMDocumentPtr;
- class XMLDOMElement;
- typedef helpers::ObjectPtrT<XMLDOMElement> XMLDOMElementPtr;
-
class XMLDOMNodeList;
typedef helpers::ObjectPtrT<XMLDOMNodeList> XMLDOMNodeListPtr;
@@ -66,6 +69,20 @@
virtual XMLDOMNodeType getNodeType() = 0;
virtual XMLDOMDocumentPtr getOwnerDocument() = 0;
};
+ LOG4CXX_PTR_DEF(XMLDOMNode);
+
+
+ /**
+ The XMLDOMElement interface represents an element in an XML document
+ */
+ class LOG4CXX_EXPORT XMLDOMElement : virtual public XMLDOMNode
+ {
+ public:
+ DECLARE_ABSTRACT_LOG4CXX_OBJECT(XMLDOMElement)
+ virtual LogString getTagName() = 0;
+ virtual LogString getAttribute(const LogString& name) = 0;
+ };
+ LOG4CXX_PTR_DEF(XMLDOMElement);
/**
The XMLDOMDocument interface represents an entire XML document.
@@ -82,17 +99,7 @@
virtual XMLDOMElementPtr getElementById(const LogString& tagName,
const LogString& elementId) = 0;
};
-
- /**
- The XMLDOMElement interface represents an element in an XML document
- */
- class LOG4CXX_EXPORT XMLDOMElement : virtual public XMLDOMNode
- {
- public:
- DECLARE_ABSTRACT_LOG4CXX_OBJECT(XMLDOMElement)
- virtual LogString getTagName() = 0;
- virtual LogString getAttribute(const LogString& name) = 0;
- };
+ LOG4CXX_PTR_DEF(XMLDOMDocument);
/**
The XMLDOMNodeList interface provides the abstraction of an ordered
@@ -111,8 +118,14 @@
virtual int getLength() = 0;
virtual XMLDOMNodePtr item(int index) = 0;
};
+ LOG4CXX_PTR_DEF(XMLDOMNodeList);
} // namespace helpers
} // namespace log4cxx
+
+
+#if defined(_MSC_VER)
+#pragma warning ( pop )
+#endif
#endif // _LOG4CXX_HELPERS_XML_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=616695&r1=616694&r2=616695&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/main/include/log4cxx/hierarchy.h (original)
+++ logging/log4cxx/trunk/src/main/include/log4cxx/hierarchy.h Wed Jan 30 01:10:27 2008
@@ -32,20 +32,8 @@
#include <log4cxx/spi/hierarchyeventlistener.h>
#include <log4cxx/helpers/pool.h>
-extern "C" {
-struct apr_thread_mutex_t;
-}
-
namespace log4cxx
{
- namespace spi
- {
- class HierarchyEventListener;
- typedef log4cxx::helpers::ObjectPtrT<HierarchyEventListener>
- HierarchyEventListenerPtr;
- typedef std::vector<HierarchyEventListenerPtr> HierarchyEventListenerList;
- }
-
/**
This class is specialized in retrieving loggers by name and also
maintaining the logger hierarchy.
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=616695&r1=616694&r2=616695&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/main/include/log4cxx/htmllayout.h (original)
+++ logging/log4cxx/trunk/src/main/include/log4cxx/htmllayout.h Wed Jan 30 01:10:27 2008
@@ -25,9 +25,6 @@
namespace log4cxx
{
- class HTMLLayout;
- typedef helpers::ObjectPtrT<HTMLLayout> HTMLLayoutPtr;
-
/**
This layout outputs events in a HTML table.
*/
@@ -119,6 +116,7 @@
{ return false; }
}; // class HtmlLayout
+ LOG4CXX_PTR_DEF(HTMLLayout);
} // namespace log4cxx
#endif // _LOG4CXX_HTML_LAYOUT_H
Modified: logging/log4cxx/trunk/src/main/include/log4cxx/net/smtpappender.h
URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/main/include/log4cxx/net/smtpappender.h?rev=616695&r1=616694&r2=616695&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/main/include/log4cxx/net/smtpappender.h (original)
+++ logging/log4cxx/trunk/src/main/include/log4cxx/net/smtpappender.h Wed Jan 30 01:10:27 2008
@@ -275,7 +275,7 @@
bool getLocationInfo() const;
}; // class SMTPAppender
- typedef helpers::ObjectPtrT<SMTPAppender> SMTPAppenderPtr;
+ LOG4CXX_PTR_DEF(SMTPAppender);
} // namespace net
} // namespace log4cxx
Modified: logging/log4cxx/trunk/src/main/include/log4cxx/net/socketappender.h
URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/main/include/log4cxx/net/socketappender.h?rev=616695&r1=616694&r2=616695&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/main/include/log4cxx/net/socketappender.h (original)
+++ logging/log4cxx/trunk/src/main/include/log4cxx/net/socketappender.h Wed Jan 30 01:10:27 2008
@@ -19,13 +19,10 @@
#define _LOG4CXX_NET_SOCKET_APPENDER_H
#include <log4cxx/net/socketappenderskeleton.h>
+#include <log4cxx/helpers/objectoutputstream.h>
namespace log4cxx
{
- namespace helpers {
- class ObjectOutputStream;
- typedef ObjectPtrT<ObjectOutputStream> ObjectOutputStreamPtr;
- }
namespace net
{
@@ -137,7 +134,7 @@
}; // class SocketAppender
- typedef helpers::ObjectPtrT<SocketAppender> SocketAppenderPtr;
+ LOG4CXX_PTR_DEF(SocketAppender);
} // namespace net
} // namespace log4cxx
Modified: logging/log4cxx/trunk/src/main/include/log4cxx/net/socketappenderskeleton.h
URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/main/include/log4cxx/net/socketappenderskeleton.h?rev=616695&r1=616694&r2=616695&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/main/include/log4cxx/net/socketappenderskeleton.h (original)
+++ logging/log4cxx/trunk/src/main/include/log4cxx/net/socketappenderskeleton.h Wed Jan 30 01:10:27 2008
@@ -21,15 +21,10 @@
#include <log4cxx/appenderskeleton.h>
#include <log4cxx/helpers/socket.h>
#include <log4cxx/helpers/thread.h>
-
+#include <log4cxx/helpers/objectoutputstream.h>
namespace log4cxx
{
- namespace helpers
- {
- class OutputStream;
- typedef helpers::ObjectPtrT<OutputStream> OutputStreamPtr;
- }
namespace net
{
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=616695&r1=616694&r2=616695&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/main/include/log4cxx/net/sockethubappender.h (original)
+++ logging/log4cxx/trunk/src/main/include/log4cxx/net/sockethubappender.h Wed Jan 30 01:10:27 2008
@@ -190,7 +190,7 @@
static void* LOG4CXX_THREAD_FUNC monitor(helpers::log4cxx_thread_t* thread, void* data);
}; // class SocketHubAppender
- typedef helpers::ObjectPtrT<SocketHubAppender> SocketHubAppenderPtr;
+ LOG4CXX_PTR_DEF(SocketHubAppender);
} // namespace net
} // namespace log4cxx
Modified: logging/log4cxx/trunk/src/main/include/log4cxx/net/syslogappender.h
URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/main/include/log4cxx/net/syslogappender.h?rev=616695&r1=616694&r2=616695&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/main/include/log4cxx/net/syslogappender.h (original)
+++ logging/log4cxx/trunk/src/main/include/log4cxx/net/syslogappender.h Wed Jan 30 01:10:27 2008
@@ -25,9 +25,6 @@
{
namespace net
{
- class SyslogAppender;
- typedef helpers::ObjectPtrT<SyslogAppender> SyslogAppenderPtr;
-
/** Use SyslogAppender to send log messages to a remote syslog daemon.*/
class LOG4CXX_EXPORT SyslogAppender : public AppenderSkeleton
{
@@ -136,6 +133,7 @@
SyslogAppender(const SyslogAppender&);
SyslogAppender& operator=(const SyslogAppender&);
}; // class SyslogAppender
+ LOG4CXX_PTR_DEF(SyslogAppender);
} // namespace net
} // namespace log4cxx
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=616695&r1=616694&r2=616695&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/main/include/log4cxx/net/xmlsocketappender.h (original)
+++ logging/log4cxx/trunk/src/main/include/log4cxx/net/xmlsocketappender.h Wed Jan 30 01:10:27 2008
@@ -141,7 +141,7 @@
XMLSocketAppender& operator=(const XMLSocketAppender&);
}; // class XMLSocketAppender
- typedef helpers::ObjectPtrT<XMLSocketAppender> XMLSocketAppenderPtr;
+ LOG4CXX_PTR_DEF(XMLSocketAppender);
} // namespace net
} // namespace log4cxx
Modified: logging/log4cxx/trunk/src/main/include/log4cxx/nt/nteventlogappender.h
URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/main/include/log4cxx/nt/nteventlogappender.h?rev=616695&r1=616694&r2=616695&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/main/include/log4cxx/nt/nteventlogappender.h (original)
+++ logging/log4cxx/trunk/src/main/include/log4cxx/nt/nteventlogappender.h Wed Jan 30 01:10:27 2008
@@ -107,7 +107,7 @@
NTEventLogAppender& operator=(const NTEventLogAppender&);
}; // class NTEventLogAppender
- typedef helpers::ObjectPtrT<NTEventLogAppender> NTEventLogAppenderPtr;
+ LOG4CXX_PTR_DEF(NTEventLogAppender);
} // namespace nt
} // namespace log4cxx
Modified: logging/log4cxx/trunk/src/main/include/log4cxx/pattern/datepatternconverter.h
URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/main/include/log4cxx/pattern/datepatternconverter.h?rev=616695&r1=616694&r2=616695&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/main/include/log4cxx/pattern/datepatternconverter.h (original)
+++ logging/log4cxx/trunk/src/main/include/log4cxx/pattern/datepatternconverter.h Wed Jan 30 01:10:27 2008
@@ -86,7 +86,7 @@
log4cxx::helpers::Pool& p) const;
};
-typedef helpers::ObjectPtrT<DatePatternConverter> DatePatternConverterPtr;
+LOG4CXX_PTR_DEF(DatePatternConverter);
}
}
Modified: logging/log4cxx/trunk/src/main/include/log4cxx/pattern/formattinginfo.h
URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/main/include/log4cxx/pattern/formattinginfo.h?rev=616695&r1=616694&r2=616695&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/main/include/log4cxx/pattern/formattinginfo.h (original)
+++ logging/log4cxx/trunk/src/main/include/log4cxx/pattern/formattinginfo.h Wed Jan 30 01:10:27 2008
@@ -109,7 +109,7 @@
*/
void format(const int fieldStart, LogString& buffer) const;
};
-
+LOG4CXX_PTR_DEF(FormattingInfo);
}
}
Modified: logging/log4cxx/trunk/src/main/include/log4cxx/pattern/integerpatternconverter.h
URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/main/include/log4cxx/pattern/integerpatternconverter.h?rev=616695&r1=616694&r2=616695&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/main/include/log4cxx/pattern/integerpatternconverter.h (original)
+++ logging/log4cxx/trunk/src/main/include/log4cxx/pattern/integerpatternconverter.h Wed Jan 30 01:10:27 2008
@@ -60,7 +60,7 @@
log4cxx::helpers::Pool& p) const;
};
-typedef helpers::ObjectPtrT<IntegerPatternConverter> IntegerPatternConverterPtr;
+LOG4CXX_PTR_DEF(IntegerPatternConverter);
}
}
Modified: logging/log4cxx/trunk/src/main/include/log4cxx/pattern/loggingeventpatternconverter.h
URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/main/include/log4cxx/pattern/loggingeventpatternconverter.h?rev=616695&r1=616694&r2=616695&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/main/include/log4cxx/pattern/loggingeventpatternconverter.h (original)
+++ logging/log4cxx/trunk/src/main/include/log4cxx/pattern/loggingeventpatternconverter.h Wed Jan 30 01:10:27 2008
@@ -19,13 +19,9 @@
#define _LOG4CXX_PATTERN_LOGGING_EVENT_PATTERN_CONVERTER_H
#include <log4cxx/pattern/patternconverter.h>
+#include <log4cxx/spi/loggingevent.h>
namespace log4cxx {
- namespace spi {
- class LoggingEvent;
-
- typedef helpers::ObjectPtrT<LoggingEvent> LoggingEventPtr;
- }
namespace pattern {
/**
@@ -82,7 +78,7 @@
virtual bool handlesThrowable() const;
};
-typedef helpers::ObjectPtrT<LoggingEventPatternConverter> LoggingEventPatternConverterPtr;
+LOG4CXX_PTR_DEF(LoggingEventPatternConverter);
}
}
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=616695&r1=616694&r2=616695&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/main/include/log4cxx/patternlayout.h (original)
+++ logging/log4cxx/trunk/src/main/include/log4cxx/patternlayout.h Wed Jan 30 01:10:27 2008
@@ -33,8 +33,6 @@
namespace log4cxx
{
- class PatternLayout;
- typedef helpers::ObjectPtrT<PatternLayout> PatternLayoutPtr;
/**
A flexible layout configurable with pattern string.
Modified: logging/log4cxx/trunk/src/main/include/log4cxx/rolling/filerenameaction.h
URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/main/include/log4cxx/rolling/filerenameaction.h?rev=616695&r1=616694&r2=616695&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/main/include/log4cxx/rolling/filerenameaction.h (original)
+++ logging/log4cxx/trunk/src/main/include/log4cxx/rolling/filerenameaction.h Wed Jan 30 01:10:27 2008
@@ -51,7 +51,7 @@
virtual bool execute(log4cxx::helpers::Pool& pool) const;
};
- typedef log4cxx::helpers::ObjectPtrT<FileRenameAction> FileRenameActionPtr;
+ LOG4CXX_PTR_DEF(FileRenameAction);
}
}
Modified: logging/log4cxx/trunk/src/main/include/log4cxx/rolling/filterbasedtriggeringpolicy.h
URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/main/include/log4cxx/rolling/filterbasedtriggeringpolicy.h?rev=616695&r1=616694&r2=616695&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/main/include/log4cxx/rolling/filterbasedtriggeringpolicy.h (original)
+++ logging/log4cxx/trunk/src/main/include/log4cxx/rolling/filterbasedtriggeringpolicy.h Wed Jan 30 01:10:27 2008
@@ -110,7 +110,7 @@
void setOption(const LogString& option, const LogString& value);
};
- typedef helpers::ObjectPtrT<FilterBasedTriggeringPolicy> FilterBasedTriggeringPolicyPtr;
+ LOG4CXX_PTR_DEF(FilterBasedTriggeringPolicy);
}
}
Modified: logging/log4cxx/trunk/src/main/include/log4cxx/rolling/fixedwindowrollingpolicy.h
URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/main/include/log4cxx/rolling/fixedwindowrollingpolicy.h?rev=616695&r1=616694&r2=616695&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/main/include/log4cxx/rolling/fixedwindowrollingpolicy.h (original)
+++ logging/log4cxx/trunk/src/main/include/log4cxx/rolling/fixedwindowrollingpolicy.h Wed Jan 30 01:10:27 2008
@@ -132,7 +132,7 @@
};
- typedef log4cxx::helpers::ObjectPtrT<FixedWindowRollingPolicy> FixedWindowRollingPolicyPtr;
+ LOG4CXX_PTR_DEF(FixedWindowRollingPolicy);
}
}
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=616695&r1=616694&r2=616695&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/main/include/log4cxx/rolling/gzcompressaction.h (original)
+++ logging/log4cxx/trunk/src/main/include/log4cxx/rolling/gzcompressaction.h Wed Jan 30 01:10:27 2008
@@ -17,6 +17,11 @@
#if !defined(_LOG4CXX_ROLLING_GZ_COMPRESS_ACTION_H)
#define _LOG4CXX_ROLLING_GZ_COMPRESS_ACTION_H
+
+#if defined(_MSC_VER)
+#pragma warning ( push )
+#pragma warning ( disable: 4786 4231 )
+#endif
#include <log4cxx/rolling/action.h>
#include <log4cxx/file.h>
@@ -55,9 +60,14 @@
GZCompressAction& operator=(const GZCompressAction&);
};
- typedef log4cxx::helpers::ObjectPtrT<GZCompressAction> GZCompressActionPtr;
+ LOG4CXX_PTR_DEF(GZCompressAction);
}
-}
+}
+
+#if defined(_MSC_VER)
+#pragma warning ( pop )
+#endif
+
#endif
Modified: logging/log4cxx/trunk/src/main/include/log4cxx/rolling/rolloverdescription.h
URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/main/include/log4cxx/rolling/rolloverdescription.h?rev=616695&r1=616694&r2=616695&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/main/include/log4cxx/rolling/rolloverdescription.h (original)
+++ logging/log4cxx/trunk/src/main/include/log4cxx/rolling/rolloverdescription.h Wed Jan 30 01:10:27 2008
@@ -96,7 +96,7 @@
ActionPtr getAsynchronous() const;
};
- typedef log4cxx::helpers::ObjectPtrT<RolloverDescription> RolloverDescriptionPtr;
+ LOG4CXX_PTR_DEF(RolloverDescription);
}
}
Modified: logging/log4cxx/trunk/src/main/include/log4cxx/rolling/sizebasedtriggeringpolicy.h
URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/main/include/log4cxx/rolling/sizebasedtriggeringpolicy.h?rev=616695&r1=616694&r2=616695&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/main/include/log4cxx/rolling/sizebasedtriggeringpolicy.h (original)
+++ logging/log4cxx/trunk/src/main/include/log4cxx/rolling/sizebasedtriggeringpolicy.h Wed Jan 30 01:10:27 2008
@@ -74,7 +74,7 @@
void setOption(const LogString& option, const LogString& value);
};
- typedef log4cxx::helpers::ObjectPtrT<SizeBasedTriggeringPolicy> SizeBasedTriggeringPolicyPtr;
+ LOG4CXX_PTR_DEF(SizeBasedTriggeringPolicy);
}
}
Modified: logging/log4cxx/trunk/src/main/include/log4cxx/rolling/timebasedrollingpolicy.h
URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/main/include/log4cxx/rolling/timebasedrollingpolicy.h?rev=616695&r1=616694&r2=616695&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/main/include/log4cxx/rolling/timebasedrollingpolicy.h (original)
+++ logging/log4cxx/trunk/src/main/include/log4cxx/rolling/timebasedrollingpolicy.h Wed Jan 30 01:10:27 2008
@@ -216,7 +216,7 @@
};
- typedef log4cxx::helpers::ObjectPtrT<TimeBasedRollingPolicy> TimeBasedRollingPolicyPtr;
+ LOG4CXX_PTR_DEF(TimeBasedRollingPolicy);
}
}
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=616695&r1=616694&r2=616695&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/main/include/log4cxx/rolling/zipcompressaction.h (original)
+++ logging/log4cxx/trunk/src/main/include/log4cxx/rolling/zipcompressaction.h Wed Jan 30 01:10:27 2008
@@ -16,7 +16,13 @@
*/
#if !defined(_LOG4CXX_ROLLING_ZIP_COMPRESS_ACTION_H)
-#define _LOG4CXX_ROLLING_ZIP_COMPRESS_ACTION_H
+#define _LOG4CXX_ROLLING_ZIP_COMPRESS_ACTION_H
+
+#if defined(_MSC_VER)
+#pragma warning ( push )
+#pragma warning ( disable: 4786 4231 )
+#endif
+
#include <log4cxx/rolling/action.h>
#include <log4cxx/file.h>
@@ -55,9 +61,14 @@
ZipCompressAction& operator=(const ZipCompressAction&);
};
- typedef log4cxx::helpers::ObjectPtrT<ZipCompressAction> ZipCompressActionPtr;
+ LOG4CXX_PTR_DEF(ZipCompressAction);
- }
+ }
+
+#if defined(_MSC_VER)
+#pragma warning ( pop )
+#endif
+
}
#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=616695&r1=616694&r2=616695&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/main/include/log4cxx/rollingfileappender.h (original)
+++ logging/log4cxx/trunk/src/main/include/log4cxx/rollingfileappender.h Wed Jan 30 01:10:27 2008
@@ -17,24 +17,11 @@
#ifndef _LOG4CXX_ROLLING_FILE_APPENDER_H
#define _LOG4CXX_ROLLING_FILE_APPENDER_H
-#include <log4cxx/fileappender.h>
-#include <log4cxx/helpers/optionconverter.h>
+#include <log4cxx/rolling/rollingfileappender.h>
namespace log4cxx
{
- class RollingFileAppender;
-
- typedef log4cxx::helpers::ObjectPtrT < RollingFileAppender > RollingFileAppenderPtr;
-
- namespace rolling
- {
- class RollingFileAppender;
- typedef log4cxx::helpers::ObjectPtrT < RollingFileAppender > RollingFileAppenderPtr;
- }
-
-
-
/** RollingFileAppender extends FileAppender to backup the log files when they reach a certain size. */
class LOG4CXX_EXPORT RollingFileAppender : public log4cxx::helpers::ObjectImpl, public Appender
{
@@ -257,6 +244,8 @@
bool requiresLayout() const;
}; // class RollingFileAppender
+ LOG4CXX_PTR_DEF(RollingFileAppender)
+
} // namespace log4cxx
#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=616695&r1=616694&r2=616695&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/main/include/log4cxx/simplelayout.h (original)
+++ logging/log4cxx/trunk/src/main/include/log4cxx/simplelayout.h Wed Jan 30 01:10:27 2008
@@ -22,9 +22,6 @@
namespace log4cxx
{
- class SimpleLayout;
- typedef helpers::ObjectPtrT<SimpleLayout> SimpleLayoutPtr;
-
/**
SimpleLayout consists of the level of the log statement,
followed by " - " and then the log message itself. For example,
@@ -69,6 +66,7 @@
virtual void setOption(const LogString& /* option */,
const LogString& /* value */) {}
};
+ LOG4CXX_PTR_DEF(SimpleLayout);
} // namespace log4cxx
#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=616695&r1=616694&r2=616695&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/main/include/log4cxx/spi/appenderattachable.h (original)
+++ logging/log4cxx/trunk/src/main/include/log4cxx/spi/appenderattachable.h Wed Jan 30 01:10:27 2008
@@ -18,6 +18,11 @@
#ifndef _LOG4CXX_SPI_APPENDER_ATTACHABLE_H_
#define _LOG4CXX_SPI_APPENDER_ATTACHABLE_H_
+#if defined(_MSC_VER)
+#pragma warning ( push )
+#pragma warning ( disable: 4786 4231 )
+#endif
+
#include <log4cxx/logstring.h>
#include <vector>
#include <log4cxx/helpers/objectptr.h>
@@ -84,5 +89,10 @@
}
}
+
+#if defined(_MSC_VER)
+#pragma warning ( pop )
+#endif
+
#endif //_LOG4CXX_SPI_APPENDER_ATTACHABLE_H_
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=616695&r1=616694&r2=616695&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/main/include/log4cxx/spi/hierarchyeventlistener.h (original)
+++ logging/log4cxx/trunk/src/main/include/log4cxx/spi/hierarchyeventlistener.h Wed Jan 30 01:10:27 2008
@@ -25,11 +25,12 @@
-#include <log4cxx/appender.h>
-#include <log4cxx/logger.h>
-
namespace log4cxx
{
+ class Logger;
+ class Appender;
+
+
namespace spi
{
@@ -40,12 +41,17 @@
public:
virtual ~HierarchyEventListener() {}
- virtual void addAppenderEvent(const LoggerPtr& logger, const AppenderPtr&
- appender) = 0;
+ virtual void addAppenderEvent(
+ const log4cxx::helpers::ObjectPtrT<Logger>& logger,
+ const log4cxx::helpers::ObjectPtrT<Appender>& appender) = 0;
- virtual void removeAppenderEvent(const LoggerPtr& logger,
- const AppenderPtr& appender) = 0;
+ virtual void removeAppenderEvent(
+ const log4cxx::helpers::ObjectPtrT<Logger>& logger,
+ const log4cxx::helpers::ObjectPtrT<Appender>& appender) = 0;
};
+ LOG4CXX_PTR_DEF(HierarchyEventListener)
+ LOG4CXX_LIST_DEF(HierarchyEventListenerList, HierarchyEventListenerPtr)
+
} // namespace spi
} // namespace log4cxx
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=616695&r1=616694&r2=616695&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/main/include/log4cxx/spi/loggerrepository.h (original)
+++ logging/log4cxx/trunk/src/main/include/log4cxx/spi/loggerrepository.h Wed Jan 30 01:10:27 2008
@@ -27,15 +27,12 @@
#include <log4cxx/appender.h>
#include <log4cxx/spi/loggerfactory.h>
#include <log4cxx/level.h>
+#include <log4cxx/spi/hierarchyeventlistener.h>
namespace log4cxx
{
namespace spi
{
- class HierarchyEventListener;
- LOG4CXX_PTR_DEF(HierarchyEventListener)
- LOG4CXX_LIST_DEF(HierarchyEventListenerList, HierarchyEventListenerPtr)
-
/**
A <code>LoggerRepository</code> is used to create and retrieve
Modified: logging/log4cxx/trunk/src/main/include/log4cxx/spi/repositoryselector.h
URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/main/include/log4cxx/spi/repositoryselector.h?rev=616695&r1=616694&r2=616695&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/main/include/log4cxx/spi/repositoryselector.h (original)
+++ logging/log4cxx/trunk/src/main/include/log4cxx/spi/repositoryselector.h Wed Jan 30 01:10:27 2008
@@ -28,9 +28,6 @@
class LoggerRepository;
typedef helpers::ObjectPtrT<LoggerRepository> LoggerRepositoryPtr;
- class RepositorySelector;
- typedef helpers::ObjectPtrT<RepositorySelector> RepositorySelectorPtr;
-
/**
The <code>LogManager</code> uses one (and only one)
<code>RepositorySelector</code> implementation to select the
@@ -50,6 +47,7 @@
virtual ~RepositorySelector() {}
virtual LoggerRepositoryPtr& getLoggerRepository() = 0;
};
+ LOG4CXX_PTR_DEF(RepositorySelector);
} //namespace spi
} //namespace log4cxx
Modified: logging/log4cxx/trunk/src/main/include/log4cxx/spi/triggeringeventevaluator.h
URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/main/include/log4cxx/spi/triggeringeventevaluator.h?rev=616695&r1=616694&r2=616695&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/main/include/log4cxx/spi/triggeringeventevaluator.h (original)
+++ logging/log4cxx/trunk/src/main/include/log4cxx/spi/triggeringeventevaluator.h Wed Jan 30 01:10:27 2008
@@ -18,20 +18,12 @@
#ifndef _LOG4CXX_SPI_TRIGGERING_EVENT_EVALUATOR_H
#define _LOG4CXX_SPI_TRIGGERING_EVENT_EVALUATOR_H
-#include <log4cxx/helpers/object.h>
-#include <log4cxx/helpers/objectptr.h>
+#include <log4cxx/spi/loggingevent.h>
namespace log4cxx
{
namespace spi
{
- class TriggeringEventEvaluator;
- typedef helpers::ObjectPtrT<TriggeringEventEvaluator>
- TriggeringEventEvaluatorPtr;
-
- class LoggingEvent;
- typedef helpers::ObjectPtrT<LoggingEvent> LoggingEventPtr;
-
/**
Implementions of this interface allow certain appenders to decide
when to perform an appender specific action.
@@ -51,6 +43,7 @@
*/
virtual bool isTriggeringEvent(const spi::LoggingEventPtr& event) = 0;
};
+ LOG4CXX_PTR_DEF(TriggeringEventEvaluator);
}
}
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=616695&r1=616694&r2=616695&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/main/include/log4cxx/ttcclayout.h (original)
+++ logging/log4cxx/trunk/src/main/include/log4cxx/ttcclayout.h Wed Jan 30 01:10:27 2008
@@ -22,8 +22,6 @@
namespace log4cxx
{
- class TTCCLayout;
- typedef helpers::ObjectPtrT<TTCCLayout> TTCCLayoutPtr;
/**
TTCC layout format consists of time, thread, logger name and nested
@@ -172,6 +170,7 @@
*/
virtual bool ignoresThrowable() const { return true; }
};
+ LOG4CXX_PTR_DEF(TTCCLayout);
}
#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=616695&r1=616694&r2=616695&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/main/include/log4cxx/writerappender.h (original)
+++ logging/log4cxx/trunk/src/main/include/log4cxx/writerappender.h Wed Jan 30 01:10:27 2008
@@ -201,7 +201,7 @@
WriterAppender& operator=(const WriterAppender&);
};
- typedef helpers::ObjectPtrT<WriterAppender> WriterAppenderPtr;
+ LOG4CXX_PTR_DEF(WriterAppender);
} //namespace log4cxx
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=616695&r1=616694&r2=616695&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/main/include/log4cxx/xml/domconfigurator.h (original)
+++ logging/log4cxx/trunk/src/main/include/log4cxx/xml/domconfigurator.h Wed Jan 30 01:10:27 2008
@@ -26,58 +26,26 @@
#include <log4cxx/logstring.h>
-#include <log4cxx/helpers/objectptr.h>
-#include <log4cxx/helpers/objectimpl.h>
#include <map>
#include <log4cxx/appender.h>
#include <log4cxx/layout.h>
#include <log4cxx/logger.h>
#include <log4cxx/helpers/properties.h>
#include <log4cxx/spi/configurator.h>
-
-struct apr_xml_doc;
-struct apr_xml_elem;
+#include <log4cxx/helpers/charsetdecoder.h>
+#include <log4cxx/spi/filter.h>
+#include <log4cxx/rolling/triggeringpolicy.h>
+#include <log4cxx/rolling/rollingpolicy.h>
+#include <log4cxx/file.h>
+#include <log4cxx/config/propertysetter.h>
+
+extern "C" {
+ struct apr_xml_doc;
+ struct apr_xml_elem;
+}
namespace log4cxx
{
- class File;
-
- namespace helpers {
- class CharsetDecoder;
- typedef helpers::ObjectPtrT<CharsetDecoder> CharsetDecoderPtr;
- }
-
- namespace spi
- {
- class LoggerRepository;
- typedef helpers::ObjectPtrT<LoggerRepository> LoggerRepositoryPtr;
-
- class Filter;
- typedef helpers::ObjectPtrT<Filter> FilterPtr;
-
- class AppenderAttachable;
- typedef helpers::ObjectPtrT<AppenderAttachable> AppenderAttachablePtr;
-
- class OptionHandler;
- typedef helpers::ObjectPtrT<OptionHandler> OptionHandlerPtr;
- }
-
-
- namespace config
- {
- class PropertySetter;
- }
-
- namespace rolling
- {
- class RollingPolicy;
- typedef helpers::ObjectPtrT<RollingPolicy> RollingPolicyPtr;
-
- class TriggeringPolicy;
- typedef helpers::ObjectPtrT<TriggeringPolicy> TriggeringPolicyPtr;
- }
-
-
namespace xml
{
@@ -227,7 +195,7 @@
log4cxx::helpers::Pool& p,
log4cxx::helpers::CharsetDecoderPtr& utf8Decoder,
apr_xml_elem* elem,
- config::PropertySetter& propSetter);
+ log4cxx::config::PropertySetter& propSetter);
/**
Used internally to configure the log4cxx framework from
@@ -337,6 +305,7 @@
DOMConfigurator& operator=(const DOMConfigurator&);
};
+ LOG4CXX_PTR_DEF(DOMConfigurator);
} // namespace xml
} // namespace log4cxx
Modified: logging/log4cxx/trunk/src/main/include/log4cxx/xml/xmllayout.h
URL: http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/main/include/log4cxx/xml/xmllayout.h?rev=616695&r1=616694&r2=616695&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/main/include/log4cxx/xml/xmllayout.h (original)
+++ logging/log4cxx/trunk/src/main/include/log4cxx/xml/xmllayout.h Wed Jan 30 01:10:27 2008
@@ -24,8 +24,6 @@
{
namespace xml
{
- class XMLLayout;
- typedef helpers::ObjectPtrT<XMLLayout> XMLLayoutPtr;
/**
The output of the XMLLayout consists of a series of log4j:event
@@ -133,6 +131,7 @@
{ return false; }
}; // class XMLLayout
+ LOG4CXX_PTR_DEF(XMLLayout);
} // namespace xml
} // namespace log4cxx