Author: carnold
Date: Thu Feb 21 22:48:31 2008
New Revision: 630101
URL: http://svn.apache.org/viewvc?rev=630101&view=rev
Log:
LOGCXX-115: BCC and VC6 not consistent on superclass method invocation with
namespaces
Added:
logging/log4cxx/trunk/src/main/cpp/defaultrepositoryselector.cpp
logging/log4cxx/trunk/src/main/cpp/filter.cpp
Modified:
logging/log4cxx/trunk/src/main/cpp/Makefile.am
logging/log4cxx/trunk/src/main/cpp/layout.cpp
logging/log4cxx/trunk/src/main/cpp/triggeringpolicy.cpp
logging/log4cxx/trunk/src/main/include/log4cxx/spi/defaultrepositoryselector.h
logging/log4cxx/trunk/src/main/include/log4cxx/spi/filter.h
Modified: logging/log4cxx/trunk/src/main/cpp/Makefile.am
URL:
http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/main/cpp/Makefile.am?rev=630101&r1=630100&r2=630101&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/main/cpp/Makefile.am (original)
+++ logging/log4cxx/trunk/src/main/cpp/Makefile.am Thu Feb 21 22:48:31 2008
@@ -48,6 +48,7 @@
datepatternconverter.cpp \
defaultloggerfactory.cpp \
defaultconfigurator.cpp \
+ defaultrepositoryselector.cpp \
domconfigurator.cpp \
exception.cpp \
fallbackerrorhandler.cpp \
@@ -59,6 +60,7 @@
fileoutputstream.cpp \
filerenameaction.cpp \
filewatchdog.cpp \
+ filter.cpp \
filterbasedtriggeringpolicy.cpp \
fixedwindowrollingpolicy.cpp \
formattinginfo.cpp \
Added: logging/log4cxx/trunk/src/main/cpp/defaultrepositoryselector.cpp
URL:
http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/main/cpp/defaultrepositoryselector.cpp?rev=630101&view=auto
==============================================================================
--- logging/log4cxx/trunk/src/main/cpp/defaultrepositoryselector.cpp (added)
+++ logging/log4cxx/trunk/src/main/cpp/defaultrepositoryselector.cpp Thu Feb 21
22:48:31 2008
@@ -0,0 +1,40 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <log4cxx/spi/defaultrepositoryselector.h>
+
+using namespace log4cxx;
+using namespace log4cxx::spi;
+using namespace log4cxx::helpers;
+
+
+DefaultRepositorySelector::DefaultRepositorySelector(const
LoggerRepositoryPtr& repository1)
+ : repository(repository1) {
+}
+
+void DefaultRepositorySelector::addRef() const {
+ ObjectImpl::addRef();
+}
+
+
+void DefaultRepositorySelector::releaseRef() const {
+ ObjectImpl::releaseRef();
+}
+
+LoggerRepositoryPtr& DefaultRepositorySelector::getLoggerRepository() {
+ return repository;
+}
Added: logging/log4cxx/trunk/src/main/cpp/filter.cpp
URL:
http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/main/cpp/filter.cpp?rev=630101&view=auto
==============================================================================
--- logging/log4cxx/trunk/src/main/cpp/filter.cpp (added)
+++ logging/log4cxx/trunk/src/main/cpp/filter.cpp Thu Feb 21 22:48:31 2008
@@ -0,0 +1,49 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <log4cxx/logstring.h>
+#include <log4cxx/spi/filter.h>
+
+using namespace log4cxx;
+using namespace log4cxx::spi;
+using namespace log4cxx::helpers;
+
+Filter::Filter() : next() {
+}
+
+void Filter::addRef() const {
+ ObjectImpl::addRef();
+}
+
+void Filter::releaseRef() const {
+ ObjectImpl::releaseRef();
+}
+
+FilterPtr Filter::getNext() const {
+ return next;
+}
+
+void Filter::setNext(const FilterPtr& newNext) {
+ next = newNext;
+}
+
+void Filter::activateOptions(Pool&) {
+}
+
+void Filter::setOption(const LogString&, const LogString&) {
+}
+
Modified: logging/log4cxx/trunk/src/main/cpp/layout.cpp
URL:
http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/main/cpp/layout.cpp?rev=630101&r1=630100&r2=630101&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/main/cpp/layout.cpp (original)
+++ logging/log4cxx/trunk/src/main/cpp/layout.cpp Thu Feb 21 22:48:31 2008
@@ -18,6 +18,7 @@
#include <log4cxx/layout.h>
using namespace log4cxx;
+using namespace log4cxx::helpers;
IMPLEMENT_LOG4CXX_OBJECT(Layout)
@@ -25,11 +26,11 @@
Layout::~Layout() {}
void Layout::addRef() const {
- log4cxx::helpers::ObjectImpl::addRef();
+ ObjectImpl::addRef();
}
void Layout::releaseRef() const {
- log4cxx::helpers::ObjectImpl::releaseRef();
+ ObjectImpl::releaseRef();
}
LogString Layout::getContentType() const { return LOG4CXX_STR("text/plain"); }
Modified: logging/log4cxx/trunk/src/main/cpp/triggeringpolicy.cpp
URL:
http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/main/cpp/triggeringpolicy.cpp?rev=630101&r1=630100&r2=630101&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/main/cpp/triggeringpolicy.cpp (original)
+++ logging/log4cxx/trunk/src/main/cpp/triggeringpolicy.cpp Thu Feb 21 22:48:31
2008
@@ -19,6 +19,7 @@
using namespace log4cxx;
using namespace log4cxx::rolling;
+using namespace log4cxx::helpers;
IMPLEMENT_LOG4CXX_OBJECT(TriggeringPolicy)
@@ -26,9 +27,9 @@
}
void TriggeringPolicy::addRef() const {
- log4cxx::helpers::ObjectImpl::addRef();
+ ObjectImpl::addRef();
}
void TriggeringPolicy::releaseRef() const {
- log4cxx::helpers::ObjectImpl::releaseRef();
+ ObjectImpl::releaseRef();
}
Modified:
logging/log4cxx/trunk/src/main/include/log4cxx/spi/defaultrepositoryselector.h
URL:
http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/main/include/log4cxx/spi/defaultrepositoryselector.h?rev=630101&r1=630100&r2=630101&view=diff
==============================================================================
---
logging/log4cxx/trunk/src/main/include/log4cxx/spi/defaultrepositoryselector.h
(original)
+++
logging/log4cxx/trunk/src/main/include/log4cxx/spi/defaultrepositoryselector.h
Thu Feb 21 22:48:31 2008
@@ -36,17 +36,10 @@
LOG4CXX_CAST_ENTRY(RepositorySelector)
END_LOG4CXX_CAST_MAP()
- DefaultRepositorySelector(const LoggerRepositoryPtr&
repository1)
- : repository(repository1)
- {
- }
- void addRef() const {
log4cxx::helpers::ObjectImpl::addRef(); }
- void releaseRef() const {
log4cxx::helpers::ObjectImpl::releaseRef(); }
-
- virtual LoggerRepositoryPtr& getLoggerRepository()
- {
- return repository;
- }
+ DefaultRepositorySelector(const LoggerRepositoryPtr&
repository1);
+ void addRef() const;
+ void releaseRef() const;
+ virtual LoggerRepositoryPtr& getLoggerRepository();
private:
LoggerRepositoryPtr repository;
Modified: logging/log4cxx/trunk/src/main/include/log4cxx/spi/filter.h
URL:
http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/main/include/log4cxx/spi/filter.h?rev=630101&r1=630100&r2=630101&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/main/include/log4cxx/spi/filter.h (original)
+++ logging/log4cxx/trunk/src/main/include/log4cxx/spi/filter.h Thu Feb 21
22:48:31 2008
@@ -74,11 +74,10 @@
*/
FilterPtr next;
public:
- Filter() : next() {
- }
+ Filter();
- void addRef() const {
log4cxx::helpers::ObjectImpl::addRef(); }
- void releaseRef() const {
log4cxx::helpers::ObjectImpl::releaseRef(); }
+ void addRef() const;
+ void releaseRef() const;
DECLARE_ABSTRACT_LOG4CXX_OBJECT(Filter)
BEGIN_LOG4CXX_CAST_MAP()
@@ -86,13 +85,9 @@
LOG4CXX_CAST_ENTRY(spi::OptionHandler)
END_LOG4CXX_CAST_MAP()
- log4cxx::spi::FilterPtr getNext() const {
- return next;
- }
- void setNext(const log4cxx::spi::FilterPtr& newNext) {
- next = newNext;
- }
-
+ log4cxx::spi::FilterPtr getNext() const;
+ void setNext(const log4cxx::spi::FilterPtr& newNext);
+
enum FilterDecision
{
/**
@@ -118,8 +113,8 @@
default do-nothing implementation for convenience.
*/
- void activateOptions(log4cxx::helpers::Pool& /* p */) {}
- void setOption(const LogString& /* option */, const LogString& /*
value */) {}
+ void activateOptions(log4cxx::helpers::Pool& p);
+ void setOption(const LogString& option, const LogString& value);
/**
<p>If the decision is <code>DENY</code>, then the event will be
