Author: tschoening Date: Thu Feb 18 17:47:37 2016 New Revision: 1731100 URL: http://svn.apache.org/viewvc?rev=1731100&view=rev Log: LOGCXX-456: I just made a really stupid mistake and forgot to add LOG4CXX_STATIC to my own created projects, so the tests were build with "import" in mind, but there was nothing exported by the lib because it got built statically. I'm reverting my changes.
https://quality.embarcadero.com/browse/RSP-12598 Modified: incubator/log4cxx/trunk/src/main/cpp/appenderskeleton.cpp incubator/log4cxx/trunk/src/main/cpp/cyclicbuffer.cpp incubator/log4cxx/trunk/src/main/cpp/levelmatchfilter.cpp incubator/log4cxx/trunk/src/main/cpp/levelrangefilter.cpp incubator/log4cxx/trunk/src/main/cpp/loggermatchfilter.cpp incubator/log4cxx/trunk/src/main/cpp/nteventlogappender.cpp incubator/log4cxx/trunk/src/main/cpp/stringmatchfilter.cpp incubator/log4cxx/trunk/src/main/cpp/xmllayout.cpp incubator/log4cxx/trunk/src/main/include/log4cxx/appenderskeleton.h incubator/log4cxx/trunk/src/main/include/log4cxx/filter/levelmatchfilter.h incubator/log4cxx/trunk/src/main/include/log4cxx/filter/levelrangefilter.h incubator/log4cxx/trunk/src/main/include/log4cxx/filter/loggermatchfilter.h incubator/log4cxx/trunk/src/main/include/log4cxx/filter/stringmatchfilter.h incubator/log4cxx/trunk/src/main/include/log4cxx/helpers/cyclicbuffer.h incubator/log4cxx/trunk/src/main/include/log4cxx/helpers/datetimedateformat.h incubator/log4cxx/trunk/src/main/include/log4cxx/nt/nteventlogappender.h incubator/log4cxx/trunk/src/main/include/log4cxx/xml/xmllayout.h Modified: incubator/log4cxx/trunk/src/main/cpp/appenderskeleton.cpp URL: http://svn.apache.org/viewvc/incubator/log4cxx/trunk/src/main/cpp/appenderskeleton.cpp?rev=1731100&r1=1731099&r2=1731100&view=diff ============================================================================== --- incubator/log4cxx/trunk/src/main/cpp/appenderskeleton.cpp (original) +++ incubator/log4cxx/trunk/src/main/cpp/appenderskeleton.cpp Thu Feb 18 17:47:37 2016 @@ -39,7 +39,7 @@ AppenderSkeleton::AppenderSkeleton() errorHandler(new OnlyOnceErrorHandler()), headFilter(), tailFilter(), - pool(), + pool(), mutex(pool) { synchronized sync(mutex); @@ -100,16 +100,6 @@ void AppenderSkeleton::clearFilters() headFilter = tailFilter = 0; } -const spi::ErrorHandlerPtr& AppenderSkeleton::getErrorHandler() const -{ - return errorHandler; -} - -const LevelPtr& AppenderSkeleton::getThreshold() const -{ - return threshold; -} - bool AppenderSkeleton::isAsSevereAsThreshold(const LevelPtr& level) const { return ((level == 0) || level->isGreaterOrEqual(threshold)); Modified: incubator/log4cxx/trunk/src/main/cpp/cyclicbuffer.cpp URL: http://svn.apache.org/viewvc/incubator/log4cxx/trunk/src/main/cpp/cyclicbuffer.cpp?rev=1731100&r1=1731099&r2=1731100&view=diff ============================================================================== --- incubator/log4cxx/trunk/src/main/cpp/cyclicbuffer.cpp (original) +++ incubator/log4cxx/trunk/src/main/cpp/cyclicbuffer.cpp Thu Feb 18 17:47:37 2016 @@ -103,16 +103,6 @@ spi::LoggingEventPtr CyclicBuffer::get() return r; } -int CyclicBuffer::getMaxSize() const -{ - return maxSize; -} - -int CyclicBuffer::length() const -{ - return numElems; -} - /** Resize the cyclic buffer to <code>newSize</code>. @throws IllegalArgumentException if <code>newSize</code> is negative. Modified: incubator/log4cxx/trunk/src/main/cpp/levelmatchfilter.cpp URL: http://svn.apache.org/viewvc/incubator/log4cxx/trunk/src/main/cpp/levelmatchfilter.cpp?rev=1731100&r1=1731099&r2=1731100&view=diff ============================================================================== --- incubator/log4cxx/trunk/src/main/cpp/levelmatchfilter.cpp (original) +++ incubator/log4cxx/trunk/src/main/cpp/levelmatchfilter.cpp Thu Feb 18 17:47:37 2016 @@ -62,11 +62,6 @@ LogString LevelMatchFilter::getLevelToMa return levelToMatch->toString(); } -void LevelMatchFilter::setAcceptOnMatch(bool acceptOnMatch1) -{ - this->acceptOnMatch = acceptOnMatch1; -} - Filter::FilterDecision LevelMatchFilter::decide( const log4cxx::spi::LoggingEventPtr& event) const { Modified: incubator/log4cxx/trunk/src/main/cpp/levelrangefilter.cpp URL: http://svn.apache.org/viewvc/incubator/log4cxx/trunk/src/main/cpp/levelrangefilter.cpp?rev=1731100&r1=1731099&r2=1731100&view=diff ============================================================================== --- incubator/log4cxx/trunk/src/main/cpp/levelrangefilter.cpp (original) +++ incubator/log4cxx/trunk/src/main/cpp/levelrangefilter.cpp Thu Feb 18 17:47:37 2016 @@ -56,21 +56,6 @@ void LevelRangeFilter::setOption(const L } } -void LevelRangeFilter::setLevelMin(const LevelPtr& levelMin1) -{ - this->levelMin = levelMin1; -} - -void LevelRangeFilter::setLevelMax(const LevelPtr& levelMax1) -{ - this->levelMax = levelMax1; -} - -void LevelRangeFilter::setAcceptOnMatch(bool acceptOnMatch1) -{ - this->acceptOnMatch = acceptOnMatch1; -} - Filter::FilterDecision LevelRangeFilter::decide( const spi::LoggingEventPtr& event) const { Modified: incubator/log4cxx/trunk/src/main/cpp/loggermatchfilter.cpp URL: http://svn.apache.org/viewvc/incubator/log4cxx/trunk/src/main/cpp/loggermatchfilter.cpp?rev=1731100&r1=1731099&r2=1731100&view=diff ============================================================================== --- incubator/log4cxx/trunk/src/main/cpp/loggermatchfilter.cpp (original) +++ incubator/log4cxx/trunk/src/main/cpp/loggermatchfilter.cpp Thu Feb 18 17:47:37 2016 @@ -42,11 +42,6 @@ LogString LoggerMatchFilter::getLoggerTo return loggerToMatch; } -void LoggerMatchFilter::setAcceptOnMatch(bool acceptOnMatch1) -{ - this->acceptOnMatch = acceptOnMatch1; -} - void LoggerMatchFilter::setOption(const LogString& option, const LogString& value) { Modified: incubator/log4cxx/trunk/src/main/cpp/nteventlogappender.cpp URL: http://svn.apache.org/viewvc/incubator/log4cxx/trunk/src/main/cpp/nteventlogappender.cpp?rev=1731100&r1=1731099&r2=1731100&view=diff ============================================================================== --- incubator/log4cxx/trunk/src/main/cpp/nteventlogappender.cpp (original) +++ incubator/log4cxx/trunk/src/main/cpp/nteventlogappender.cpp Thu Feb 18 17:47:37 2016 @@ -142,11 +142,6 @@ void NTEventLogAppender::setOption(const } } -void NTEventLogAppender::setSource(const LogString& source) -{ - this->source.assign(source); -} - void NTEventLogAppender::activateOptions(Pool&) { if (source.empty()) Modified: incubator/log4cxx/trunk/src/main/cpp/stringmatchfilter.cpp URL: http://svn.apache.org/viewvc/incubator/log4cxx/trunk/src/main/cpp/stringmatchfilter.cpp?rev=1731100&r1=1731099&r2=1731100&view=diff ============================================================================== --- incubator/log4cxx/trunk/src/main/cpp/stringmatchfilter.cpp (original) +++ incubator/log4cxx/trunk/src/main/cpp/stringmatchfilter.cpp Thu Feb 18 17:47:37 2016 @@ -50,16 +50,6 @@ void StringMatchFilter::setOption(const } } -void StringMatchFilter::setStringToMatch(const LogString& stringToMatch1) -{ - this->stringToMatch.assign(stringToMatch1); -} - -void StringMatchFilter::setAcceptOnMatch(bool acceptOnMatch1) -{ - this->acceptOnMatch = acceptOnMatch1; -} - Filter::FilterDecision StringMatchFilter::decide( const log4cxx::spi::LoggingEventPtr& event) const { Modified: incubator/log4cxx/trunk/src/main/cpp/xmllayout.cpp URL: http://svn.apache.org/viewvc/incubator/log4cxx/trunk/src/main/cpp/xmllayout.cpp?rev=1731100&r1=1731099&r2=1731100&view=diff ============================================================================== --- incubator/log4cxx/trunk/src/main/cpp/xmllayout.cpp (original) +++ incubator/log4cxx/trunk/src/main/cpp/xmllayout.cpp Thu Feb 18 17:47:37 2016 @@ -39,11 +39,6 @@ XMLLayout::XMLLayout() { } -bool XMLLayout::getLocationInfo() const -{ - return locationInfo; -} - void XMLLayout::setOption(const LogString& option, const LogString& value) { @@ -104,7 +99,7 @@ void XMLLayout::format(LogString& output output.append(LOG4CXX_STR("\"/>")); output.append(LOG4CXX_EOL); } - + if (properties) { LoggingEvent::KeySet propertySet(event->getPropertyKeySet()); LoggingEvent::KeySet keySet(event->getMDCKeySet()); @@ -112,7 +107,7 @@ void XMLLayout::format(LogString& output output.append(LOG4CXX_STR("<log4j:properties>")); output.append(LOG4CXX_EOL); for (LoggingEvent::KeySet::const_iterator i = keySet.begin(); - i != keySet.end(); + i != keySet.end(); i++) { LogString key(*i); LogString value; @@ -126,7 +121,7 @@ void XMLLayout::format(LogString& output } } for (LoggingEvent::KeySet::const_iterator i2 = propertySet.begin(); - i2 != propertySet.end(); + i2 != propertySet.end(); i2++) { LogString key(*i2); LogString value; @@ -146,6 +141,6 @@ void XMLLayout::format(LogString& output output.append(LOG4CXX_STR("</log4j:event>")); output.append(LOG4CXX_EOL); - output.append(LOG4CXX_EOL); + output.append(LOG4CXX_EOL); } Modified: incubator/log4cxx/trunk/src/main/include/log4cxx/appenderskeleton.h URL: http://svn.apache.org/viewvc/incubator/log4cxx/trunk/src/main/include/log4cxx/appenderskeleton.h?rev=1731100&r1=1731099&r2=1731100&view=diff ============================================================================== --- incubator/log4cxx/trunk/src/main/include/log4cxx/appenderskeleton.h (original) +++ incubator/log4cxx/trunk/src/main/include/log4cxx/appenderskeleton.h Thu Feb 18 17:47:37 2016 @@ -127,7 +127,7 @@ namespace log4cxx Return the currently set spi::ErrorHandler for this Appender. */ - const spi::ErrorHandlerPtr& getErrorHandler() const; + const spi::ErrorHandlerPtr& getErrorHandler() const { return errorHandler; } /** Returns the head Filter. @@ -156,7 +156,7 @@ namespace log4cxx Returns this appenders threshold level. See the #setThreshold method for the meaning of this option. */ - const LevelPtr& getThreshold() const; + const LevelPtr& getThreshold() { return threshold; } /** Check whether the message level is below the appender's Modified: incubator/log4cxx/trunk/src/main/include/log4cxx/filter/levelmatchfilter.h URL: http://svn.apache.org/viewvc/incubator/log4cxx/trunk/src/main/include/log4cxx/filter/levelmatchfilter.h?rev=1731100&r1=1731099&r2=1731100&view=diff ============================================================================== --- incubator/log4cxx/trunk/src/main/include/log4cxx/filter/levelmatchfilter.h (original) +++ incubator/log4cxx/trunk/src/main/include/log4cxx/filter/levelmatchfilter.h Thu Feb 18 17:47:37 2016 @@ -72,7 +72,8 @@ namespace log4cxx LogString getLevelToMatch() const; - void setAcceptOnMatch(bool acceptOnMatch1); + inline void setAcceptOnMatch(bool acceptOnMatch1) + { this->acceptOnMatch = acceptOnMatch1; } inline bool getAcceptOnMatch() const { return acceptOnMatch; } Modified: incubator/log4cxx/trunk/src/main/include/log4cxx/filter/levelrangefilter.h URL: http://svn.apache.org/viewvc/incubator/log4cxx/trunk/src/main/include/log4cxx/filter/levelrangefilter.h?rev=1731100&r1=1731099&r2=1731100&view=diff ============================================================================== --- incubator/log4cxx/trunk/src/main/include/log4cxx/filter/levelrangefilter.h (original) +++ incubator/log4cxx/trunk/src/main/include/log4cxx/filter/levelrangefilter.h Thu Feb 18 17:47:37 2016 @@ -84,7 +84,8 @@ namespace log4cxx /** Set the <code>LevelMin</code> option. */ - void setLevelMin(const LevelPtr& levelMin1); + void setLevelMin(const LevelPtr& levelMin1) + { this->levelMin = levelMin1; } /** Get the value of the <code>LevelMin</code> option. @@ -95,7 +96,8 @@ namespace log4cxx /** Set the <code>LevelMax</code> option. */ - void setLevelMax(const LevelPtr& levelMax1); + void setLevelMax(const LevelPtr& levelMax1) + { this->levelMax = levelMax1; } /** Get the value of the <code>LevelMax</code> option. @@ -106,7 +108,8 @@ namespace log4cxx /** Set the <code>AcceptOnMatch</code> option. */ - void setAcceptOnMatch(bool acceptOnMatch1); + inline void setAcceptOnMatch(bool acceptOnMatch1) + { this->acceptOnMatch = acceptOnMatch1; } /** Get the value of the <code>AcceptOnMatch</code> option. Modified: incubator/log4cxx/trunk/src/main/include/log4cxx/filter/loggermatchfilter.h URL: http://svn.apache.org/viewvc/incubator/log4cxx/trunk/src/main/include/log4cxx/filter/loggermatchfilter.h?rev=1731100&r1=1731099&r2=1731100&view=diff ============================================================================== --- incubator/log4cxx/trunk/src/main/include/log4cxx/filter/loggermatchfilter.h (original) +++ incubator/log4cxx/trunk/src/main/include/log4cxx/filter/loggermatchfilter.h Thu Feb 18 17:47:37 2016 @@ -74,7 +74,8 @@ namespace log4cxx LogString getLoggerToMatch() const; - void setAcceptOnMatch(bool acceptOnMatch1); + inline void setAcceptOnMatch(bool acceptOnMatch1) + { this->acceptOnMatch = acceptOnMatch1; } inline bool getAcceptOnMatch() const { return acceptOnMatch; } Modified: incubator/log4cxx/trunk/src/main/include/log4cxx/filter/stringmatchfilter.h URL: http://svn.apache.org/viewvc/incubator/log4cxx/trunk/src/main/include/log4cxx/filter/stringmatchfilter.h?rev=1731100&r1=1731099&r2=1731100&view=diff ============================================================================== --- incubator/log4cxx/trunk/src/main/include/log4cxx/filter/stringmatchfilter.h (original) +++ incubator/log4cxx/trunk/src/main/include/log4cxx/filter/stringmatchfilter.h Thu Feb 18 17:47:37 2016 @@ -67,12 +67,14 @@ namespace log4cxx virtual void setOption(const LogString& option, const LogString& value); - void setStringToMatch(const LogString& stringToMatch1); + inline void setStringToMatch(const LogString& stringToMatch1) + { this->stringToMatch.assign(stringToMatch1); } inline const LogString& getStringToMatch() const { return stringToMatch; } - void setAcceptOnMatch(bool acceptOnMatch1); + inline void setAcceptOnMatch(bool acceptOnMatch1) + { this->acceptOnMatch = acceptOnMatch1; } inline bool getAcceptOnMatch() const { return acceptOnMatch; } Modified: incubator/log4cxx/trunk/src/main/include/log4cxx/helpers/cyclicbuffer.h URL: http://svn.apache.org/viewvc/incubator/log4cxx/trunk/src/main/include/log4cxx/helpers/cyclicbuffer.h?rev=1731100&r1=1731099&r2=1731100&view=diff ============================================================================== --- incubator/log4cxx/trunk/src/main/include/log4cxx/helpers/cyclicbuffer.h (original) +++ incubator/log4cxx/trunk/src/main/include/log4cxx/helpers/cyclicbuffer.h Thu Feb 18 17:47:37 2016 @@ -26,7 +26,7 @@ namespace log4cxx { /** CyclicBuffer is used by other appenders to hold instances of - {@link log4cxx::spi::LoggingEvent LoggingEvent} for immediate + {@link log4cxx::spi::LoggingEvent LoggingEvent} for immediate or deferred display. <p>This buffer gives read access to any element in the buffer not just the first or last element. @@ -63,7 +63,8 @@ namespace log4cxx */ spi::LoggingEventPtr get(int i); - int getMaxSize() const; + int getMaxSize() const + { return maxSize; } /** Get the oldest (first) element in the buffer. The oldest element @@ -76,7 +77,8 @@ namespace log4cxx guaranteed to be in the range 0 to <code>maxSize</code> (inclusive). */ - int length() const; + int length() const + { return numElems; } /** Resize the cyclic buffer to <code>newSize</code>. Modified: incubator/log4cxx/trunk/src/main/include/log4cxx/helpers/datetimedateformat.h URL: http://svn.apache.org/viewvc/incubator/log4cxx/trunk/src/main/include/log4cxx/helpers/datetimedateformat.h?rev=1731100&r1=1731099&r2=1731100&view=diff ============================================================================== --- incubator/log4cxx/trunk/src/main/include/log4cxx/helpers/datetimedateformat.h (original) +++ incubator/log4cxx/trunk/src/main/include/log4cxx/helpers/datetimedateformat.h Thu Feb 18 17:47:37 2016 @@ -31,7 +31,9 @@ namespace log4cxx class LOG4CXX_EXPORT DateTimeDateFormat : public SimpleDateFormat { public: - DateTimeDateFormat(const std::locale* locale = NULL) + DateTimeDateFormat() + : SimpleDateFormat(LOG4CXX_STR("dd MMM yyyy HH:mm:ss,SSS")) {} + DateTimeDateFormat(const std::locale* locale) : SimpleDateFormat(LOG4CXX_STR("dd MMM yyyy HH:mm:ss,SSS"), locale) {} }; } // namespace helpers Modified: incubator/log4cxx/trunk/src/main/include/log4cxx/nt/nteventlogappender.h URL: http://svn.apache.org/viewvc/incubator/log4cxx/trunk/src/main/include/log4cxx/nt/nteventlogappender.h?rev=1731100&r1=1731099&r2=1731100&view=diff ============================================================================== --- incubator/log4cxx/trunk/src/main/include/log4cxx/nt/nteventlogappender.h (original) +++ incubator/log4cxx/trunk/src/main/include/log4cxx/nt/nteventlogappender.h Thu Feb 18 17:47:37 2016 @@ -55,7 +55,8 @@ namespace log4cxx bool requiresLayout() const { return true; } - void setSource(const LogString& source); + void setSource(const LogString& source) + { this->source.assign(source); } const LogString& getSource() const { return source; } Modified: incubator/log4cxx/trunk/src/main/include/log4cxx/xml/xmllayout.h URL: http://svn.apache.org/viewvc/incubator/log4cxx/trunk/src/main/include/log4cxx/xml/xmllayout.h?rev=1731100&r1=1731099&r2=1731100&view=diff ============================================================================== --- incubator/log4cxx/trunk/src/main/include/log4cxx/xml/xmllayout.h (original) +++ incubator/log4cxx/trunk/src/main/include/log4cxx/xml/xmllayout.h Thu Feb 18 17:47:37 2016 @@ -84,12 +84,13 @@ namespace log4cxx /** Returns the current value of the <b>LocationInfo</b> option. */ - bool getLocationInfo() const; - + inline bool getLocationInfo() const + { return locationInfo; } + /** * Sets whether MDC key-value pairs should be output, default false. * @param flag new value. - * + * */ inline void setProperties(bool flag) { properties = flag; @@ -98,12 +99,12 @@ namespace log4cxx /** * Gets whether MDC key-value pairs should be output. * @return true if MDC key-value pairs are output. - * + * */ inline bool getProperties() { return properties; } - + /** No options to activate. */ void activateOptions(log4cxx::helpers::Pool& /* p */) { }
