Author: carnold
Date: Tue Nov 6 22:39:41 2007
New Revision: 592627
URL: http://svn.apache.org/viewvc?rev=592627&view=rev
Log:
LOGCXX-47: VC6 didn't like the template in the last commit
Modified:
logging/log4cxx/trunk/src/examples/cpp/delayedloop.cpp
logging/log4cxx/trunk/src/main/cpp/fixedwindowrollingpolicy.cpp
logging/log4cxx/trunk/src/main/cpp/logger.cpp
logging/log4cxx/trunk/src/main/cpp/patternlayout.cpp
logging/log4cxx/trunk/src/main/cpp/timebasedrollingpolicy.cpp
logging/log4cxx/trunk/src/main/include/log4cxx/pattern/patternparser.h
logging/log4cxx/trunk/src/test/cpp/pattern/patternparsertestcase.cpp
logging/log4cxx/trunk/src/test/cpp/rolling/filenamepatterntestcase.cpp
Modified: logging/log4cxx/trunk/src/examples/cpp/delayedloop.cpp
URL:
http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/examples/cpp/delayedloop.cpp?rev=592627&r1=592626&r2=592627&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/examples/cpp/delayedloop.cpp (original)
+++ logging/log4cxx/trunk/src/examples/cpp/delayedloop.cpp Tue Nov 6 22:39:41
2007
@@ -77,10 +77,9 @@
static void test()
{
int i = 0;
- logstream log(logger, Level::getDebug());
while(true)
{
- log << L"MSG " << i++ << LOG4CXX_ENDMSG;
+ LOG4CXX_DEBUG(logger, "MSG " <<
i++);
try
{
apr_sleep(1000000);
@@ -107,12 +106,12 @@
int result = EXIT_SUCCESS;
try
{
- DelayedLoop::main(argc, argv);
- }
- catch(std::exception&)
- {
- result = EXIT_FAILURE;
- }
+ DelayedLoop::main(argc, argv);
+ }
+ catch(std::exception&)
+ {
+ result = EXIT_FAILURE;
+ }
apr_terminate();
return result;
Modified: logging/log4cxx/trunk/src/main/cpp/fixedwindowrollingpolicy.cpp
URL:
http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/main/cpp/fixedwindowrollingpolicy.cpp?rev=592627&r1=592626&r2=592627&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/main/cpp/fixedwindowrollingpolicy.cpp (original)
+++ logging/log4cxx/trunk/src/main/cpp/fixedwindowrollingpolicy.cpp Tue Nov 6
22:39:41 2007
@@ -276,12 +276,13 @@
return true;
}
+#define RULES_PUT(spec, cls) \
+specs.insert(PatternMap::value_type(LogString(LOG4CXX_STR(spec)),
(PatternConstructor) cls ::newInstance))
-using namespace log4cxx::pattern;
-PatternMap FixedWindowRollingPolicy::getFormatSpecifiers() const {
+log4cxx::pattern::PatternMap FixedWindowRollingPolicy::getFormatSpecifiers()
const {
PatternMap specs;
- insertSpecifier<IntegerPatternConverter>(specs, LOG4CXX_STR("i"));
- insertSpecifier<IntegerPatternConverter>(specs, LOG4CXX_STR("index"));
+ RULES_PUT("i", IntegerPatternConverter);
+ RULES_PUT("index", IntegerPatternConverter);
return specs;
}
Modified: logging/log4cxx/trunk/src/main/cpp/logger.cpp
URL:
http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/main/cpp/logger.cpp?rev=592627&r1=592626&r2=592627&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/main/cpp/logger.cpp (original)
+++ logging/log4cxx/trunk/src/main/cpp/logger.cpp Tue Nov 6 22:39:41 2007
@@ -380,7 +380,7 @@
msg = StringHelper::format(pattern, params);
}
- forcedLog(level1, msg, location);
+ forcedLogLS(level1, msg, location);
}
}
Modified: logging/log4cxx/trunk/src/main/cpp/patternlayout.cpp
URL:
http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/main/cpp/patternlayout.cpp?rev=592627&r1=592626&r2=592627&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/main/cpp/patternlayout.cpp (original)
+++ logging/log4cxx/trunk/src/main/cpp/patternlayout.cpp Tue Nov 6 22:39:41
2007
@@ -128,52 +128,53 @@
}
}
+#define RULES_PUT(spec, cls) \
+specs.insert(PatternMap::value_type(LogString(LOG4CXX_STR(spec)),
(PatternConstructor) cls ::newInstance))
-using namespace log4cxx::pattern;
-PatternMap PatternLayout::getFormatSpecifiers() {
- PatternMap specs;
- insertSpecifier<LoggerPatternConverter>(specs, LOG4CXX_STR("c"));
- insertSpecifier<LoggerPatternConverter>(specs, LOG4CXX_STR("logger"));
+log4cxx::pattern::PatternMap PatternLayout::getFormatSpecifiers() {
+ PatternMap specs;
+ RULES_PUT("c", LoggerPatternConverter);
+ RULES_PUT("logger", LoggerPatternConverter);
- insertSpecifier<ClassNamePatternConverter>(specs, LOG4CXX_STR("C"));
- insertSpecifier<ClassNamePatternConverter>(specs, LOG4CXX_STR("class"));
+ RULES_PUT("C", ClassNamePatternConverter);
+ RULES_PUT("class", ClassNamePatternConverter);
- insertSpecifier<DatePatternConverter>(specs, LOG4CXX_STR("d"));
- insertSpecifier<DatePatternConverter>(specs, LOG4CXX_STR("date"));
+ RULES_PUT("d", DatePatternConverter);
+ RULES_PUT("date", DatePatternConverter);
- insertSpecifier<FileLocationPatternConverter>(specs, LOG4CXX_STR("F"));
- insertSpecifier<FileLocationPatternConverter>(specs, LOG4CXX_STR("file"));
+ RULES_PUT("F", FileLocationPatternConverter);
+ RULES_PUT("file", FileLocationPatternConverter);
- insertSpecifier<FullLocationPatternConverter>(specs, LOG4CXX_STR("l"));
+ RULES_PUT("l", FullLocationPatternConverter);
- insertSpecifier<LineLocationPatternConverter>(specs, LOG4CXX_STR("L"));
- insertSpecifier<LineLocationPatternConverter>(specs, LOG4CXX_STR("line"));
+ RULES_PUT("L", LineLocationPatternConverter);
+ RULES_PUT("line", LineLocationPatternConverter);
- insertSpecifier<MessagePatternConverter>(specs, LOG4CXX_STR("m"));
- insertSpecifier<MessagePatternConverter>(specs, LOG4CXX_STR("message"));
+ RULES_PUT("m", MessagePatternConverter);
+ RULES_PUT("message", MessagePatternConverter);
- insertSpecifier<LineSeparatorPatternConverter>(specs, LOG4CXX_STR("n"));
+ RULES_PUT("n", LineSeparatorPatternConverter);
- insertSpecifier<MethodLocationPatternConverter>(specs, LOG4CXX_STR("M"));
- insertSpecifier<MethodLocationPatternConverter>(specs,
LOG4CXX_STR("method"));
+ RULES_PUT("M", MethodLocationPatternConverter);
+ RULES_PUT("method", MethodLocationPatternConverter);
- insertSpecifier<LevelPatternConverter>(specs, LOG4CXX_STR("p"));
- insertSpecifier<LevelPatternConverter>(specs, LOG4CXX_STR("level"));
+ RULES_PUT("p", LevelPatternConverter);
+ RULES_PUT("level", LevelPatternConverter);
- insertSpecifier<RelativeTimePatternConverter>(specs, LOG4CXX_STR("r"));
- insertSpecifier<RelativeTimePatternConverter>(specs,
LOG4CXX_STR("relative"));
+ RULES_PUT("r", RelativeTimePatternConverter);
+ RULES_PUT("relative", RelativeTimePatternConverter);
- insertSpecifier<ThreadPatternConverter>(specs, LOG4CXX_STR("t"));
- insertSpecifier<ThreadPatternConverter>(specs, LOG4CXX_STR("thread"));
+ RULES_PUT("t", ThreadPatternConverter);
+ RULES_PUT("thread", ThreadPatternConverter);
- insertSpecifier<NDCPatternConverter>(specs, LOG4CXX_STR("x"));
- insertSpecifier<NDCPatternConverter>(specs, LOG4CXX_STR("ndc"));
+ RULES_PUT("x", NDCPatternConverter);
+ RULES_PUT("ndc", NDCPatternConverter);
- insertSpecifier<PropertiesPatternConverter>(specs, LOG4CXX_STR("X"));
- insertSpecifier<PropertiesPatternConverter>(specs,
LOG4CXX_STR("properties"));
+ RULES_PUT("X", PropertiesPatternConverter);
+ RULES_PUT("properties", PropertiesPatternConverter);
- insertSpecifier<ThrowableInformationPatternConverter>(specs,
LOG4CXX_STR("throwable"));
+ RULES_PUT("throwable", ThrowableInformationPatternConverter);
return specs;
}
Modified: logging/log4cxx/trunk/src/main/cpp/timebasedrollingpolicy.cpp
URL:
http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/main/cpp/timebasedrollingpolicy.cpp?rev=592627&r1=592626&r2=592627&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/main/cpp/timebasedrollingpolicy.cpp (original)
+++ logging/log4cxx/trunk/src/main/cpp/timebasedrollingpolicy.cpp Tue Nov 6
22:39:41 2007
@@ -76,15 +76,15 @@
}
-using namespace log4cxx::pattern;
+#define RULES_PUT(spec, cls) \
+specs.insert(PatternMap::value_type(LogString(LOG4CXX_STR(spec)),
(PatternConstructor) cls ::newInstance))
-PatternMap TimeBasedRollingPolicy::getFormatSpecifiers() const {
+log4cxx::pattern::PatternMap TimeBasedRollingPolicy::getFormatSpecifiers()
const {
PatternMap specs;
- insertSpecifier<FileDatePatternConverter>(specs, LOG4CXX_STR("d"));
- insertSpecifier<FileDatePatternConverter>(specs, LOG4CXX_STR("date"));
+ RULES_PUT("d", FileDatePatternConverter);
+ RULES_PUT("date", FileDatePatternConverter);
return specs;
}
-
/**
* [EMAIL PROTECTED]
Modified: logging/log4cxx/trunk/src/main/include/log4cxx/pattern/patternparser.h
URL:
http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/main/include/log4cxx/pattern/patternparser.h?rev=592627&r1=592626&r2=592627&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/main/include/log4cxx/pattern/patternparser.h
(original)
+++ logging/log4cxx/trunk/src/main/include/log4cxx/pattern/patternparser.h Tue
Nov 6 22:39:41 2007
@@ -31,11 +31,6 @@
typedef PatternConverterPtr (*PatternConstructor)(const
std::vector<LogString>& options);
typedef std::map<LogString, PatternConstructor> PatternMap;
-template<class Converter>
-void insertSpecifier(PatternMap& map, const LogString& specifier) {
- map.insert(PatternMap::value_type(specifier, Converter::newInstance));
-}
-
// Contributors: Nelson Minar <([EMAIL PROTECTED]>
// Igor E. Poteryaev <[EMAIL PROTECTED]>
Modified: logging/log4cxx/trunk/src/test/cpp/pattern/patternparsertestcase.cpp
URL:
http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/test/cpp/pattern/patternparsertestcase.cpp?rev=592627&r1=592626&r2=592627&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/test/cpp/pattern/patternparsertestcase.cpp
(original)
+++ logging/log4cxx/trunk/src/test/cpp/pattern/patternparsertestcase.cpp Tue
Nov 6 22:39:41 2007
@@ -60,7 +60,7 @@
using namespace log4cxx::pattern;
#define RULES_PUT(spec, cls) \
-map.insert(PatternMap::value_type(LOG4CXX_STR(spec), cls ::newInstance))
+map.insert(PatternMap::value_type(LOG4CXX_STR(spec), (PatternConstructor) cls
::newInstance))
class PatternParserTestCase : public CppUnit::TestFixture
@@ -165,7 +165,7 @@
PatternMap testRules(getFormatSpecifiers());
testRules.insert(
PatternMap::value_type(LOG4CXX_STR("z343"),
- Num343PatternConverter::newInstance));
+ (PatternConstructor) Num343PatternConverter::newInstance));
assertFormattedEquals(LOG4CXX_STR("%z343"), testRules,
LOG4CXX_STR("343"));
}
@@ -177,7 +177,7 @@
PatternMap testRules(getFormatSpecifiers());
testRules.insert(
PatternMap::value_type(LOG4CXX_STR("n343"),
- Num343PatternConverter::newInstance));
+ (PatternConstructor) Num343PatternConverter::newInstance));
assertFormattedEquals(LOG4CXX_STR("%n343"), testRules,
LOG4CXX_STR("343"));
}
Modified: logging/log4cxx/trunk/src/test/cpp/rolling/filenamepatterntestcase.cpp
URL:
http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/test/cpp/rolling/filenamepatterntestcase.cpp?rev=592627&r1=592626&r2=592627&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/test/cpp/rolling/filenamepatterntestcase.cpp
(original)
+++ logging/log4cxx/trunk/src/test/cpp/rolling/filenamepatterntestcase.cpp Tue
Nov 6 22:39:41 2007
@@ -69,8 +69,8 @@
std::vector<PatternConverterPtr> converters;
std::vector<FormattingInfoPtr> fields;
PatternMap rules;
- rules.insert(PatternMap::value_type(LOG4CXX_STR("d"),
FileDatePatternConverter::newInstance));
- rules.insert(PatternMap::value_type(LOG4CXX_STR("i"),
IntegerPatternConverter::newInstance));
+ rules.insert(PatternMap::value_type(LOG4CXX_STR("d"),
(PatternConstructor) FileDatePatternConverter::newInstance));
+ rules.insert(PatternMap::value_type(LOG4CXX_STR("i"),
(PatternConstructor) IntegerPatternConverter::newInstance));
PatternParser::parse(pattern, converters, fields, rules);
LogString result;
Pool pool;
