|
|
Boost-Commit : |
From: john.groups_at_[hidden]
Date: 2008-01-17 02:48:54
Author: jtorjo
Date: 2008-01-17 02:48:50 EST (Thu, 17 Jan 2008)
New Revision: 42829
URL: http://svn.boost.org/trac/boost/changeset/42829
Log:
[logging]
v0.20.2, 17 jan 2008
- updated the tests to compile (after the breaking change)
Added:
sandbox/logging/lib/logging/tests/all_tests.sln (contents, props changed)
sandbox/logging/lib/logging/tests/test_after_destroyed/test_after_destroyed.vcproj
- copied, changed from r42826, /sandbox/logging/lib/logging/tests/test_after_destroyed/test.vcproj
sandbox/logging/lib/logging/tests/test_file/test_file.vcproj
- copied, changed from r42797, /sandbox/logging/lib/logging/tests/test_file/test.vcproj
sandbox/logging/lib/logging/tests/test_named/test_named.vcproj
- copied, changed from r42797, /sandbox/logging/lib/logging/tests/test_named/test.vcproj
sandbox/logging/lib/logging/tests/test_named_spacer/test_named_spacer.vcproj
- copied, changed from r42797, /sandbox/logging/lib/logging/tests/test_named_spacer/test.vcproj
sandbox/logging/lib/logging/tests/test_rolling_file/test_rolling_file.vcproj
- copied, changed from r42797, /sandbox/logging/lib/logging/tests/test_rolling_file/test.vcproj
sandbox/logging/lib/logging/tests/test_tags/test_tags.vcproj
- copied, changed from r42797, /sandbox/logging/lib/logging/tests/test_tags/test.vcproj
sandbox/logging/lib/logging/tests/test_template/test_template.vcproj
- copied unchanged from r42797, /sandbox/logging/lib/logging/tests/test_template/test.vcproj
Removed:
sandbox/logging/lib/logging/tests/test_after_destroyed/test.vcproj
sandbox/logging/lib/logging/tests/test_file/test.vcproj
sandbox/logging/lib/logging/tests/test_named/test.vcproj
sandbox/logging/lib/logging/tests/test_named_spacer/test.vcproj
sandbox/logging/lib/logging/tests/test_rolling_file/test.vcproj
sandbox/logging/lib/logging/tests/test_tags/test.vcproj
sandbox/logging/lib/logging/tests/test_template/test.vcproj
Text files modified:
sandbox/logging/boost/logging/detail/macros.hpp | 2
sandbox/logging/lib/logging/samples/basic_usage/log.cpp | 14 +++---
sandbox/logging/lib/logging/samples/basic_usage/log.h | 6 +-
sandbox/logging/lib/logging/samples/basic_usage/main.cpp | 2
sandbox/logging/lib/logging/samples/compile_time/ReadMe.txt | 5 +
sandbox/logging/lib/logging/samples/compile_time/basic_usage.vcproj | 83 ++++++++++++++++++++++++++++++++++++++-
sandbox/logging/lib/logging/samples/compile_time/compile_time.sln | 5 +
sandbox/logging/lib/logging/samples/compile_time/log.cpp | 14 +++---
sandbox/logging/lib/logging/samples/compile_time/log.h | 6 +-
sandbox/logging/lib/logging/samples/compile_time/original.cpp | 8 +-
sandbox/logging/lib/logging/samples/starter/log.cpp | 14 +++---
sandbox/logging/lib/logging/samples/starter/log.h | 4
sandbox/logging/lib/logging/tests/test_after_destroyed/test_after_destroyed.vcproj | 2
sandbox/logging/lib/logging/tests/test_file/test.cpp | 22 +++++-----
sandbox/logging/lib/logging/tests/test_file/test_file.vcproj | 2
sandbox/logging/lib/logging/tests/test_log_output/test_log_output.cpp | 10 ++--
sandbox/logging/lib/logging/tests/test_named/test.cpp | 10 ++--
sandbox/logging/lib/logging/tests/test_named/test_named.vcproj | 2
sandbox/logging/lib/logging/tests/test_named_spacer/test.cpp | 12 ++--
sandbox/logging/lib/logging/tests/test_named_spacer/test_named_spacer.vcproj | 2
sandbox/logging/lib/logging/tests/test_rolling_file/test.cpp | 30 +++++++-------
sandbox/logging/lib/logging/tests/test_rolling_file/test_rolling_file.vcproj | 2
sandbox/logging/lib/logging/tests/test_tags/test_tags.cpp | 24 +++++-----
sandbox/logging/lib/logging/tests/test_tags/test_tags.vcproj | 2
sandbox/logging/lib/logging/tests/test_tss/test_tss.cpp | 2
25 files changed, 183 insertions(+), 102 deletions(-)
Modified: sandbox/logging/boost/logging/detail/macros.hpp
==============================================================================
--- sandbox/logging/boost/logging/detail/macros.hpp (original)
+++ sandbox/logging/boost/logging/detail/macros.hpp 2008-01-17 02:48:50 EST (Thu, 17 Jan 2008)
@@ -568,7 +568,7 @@
{ static type l; return &l; } \
namespace { boost::logging::ensure_early_log_creation ensure_log_is_created_before_main ## name ( * name () ); }
-#define BOOST_DEFINE_LOG_FILTER_WITH_ARGS(name,type, args) type * name () { \
+#define BOOST_DEFINE_LOG_FILTER_WITH_ARGS(name,type, args) type * name () \
{ static type l ( args ); return &l; } \
namespace { boost::logging::ensure_early_log_creation ensure_log_is_created_before_main ## name ( * name () ); }
Modified: sandbox/logging/lib/logging/samples/basic_usage/log.cpp
==============================================================================
--- sandbox/logging/lib/logging/samples/basic_usage/log.cpp (original)
+++ sandbox/logging/lib/logging/samples/basic_usage/log.cpp 2008-01-17 02:48:50 EST (Thu, 17 Jan 2008)
@@ -13,13 +13,13 @@
void init_logs() {
// Add formatters and destinations
// That is, how the message is to be formatted...
- g_l->writer().add_formatter( formatter::idx() );
- g_l->writer().add_formatter( formatter::time("$hh:$mm.$ss ") );
- g_l->writer().add_formatter( formatter::append_newline() );
+ g_l()->writer().add_formatter( formatter::idx() );
+ g_l()->writer().add_formatter( formatter::time("$hh:$mm.$ss ") );
+ g_l()->writer().add_formatter( formatter::append_newline() );
// ... and where should it be written to
- g_l->writer().add_destination( destination::cout() );
- g_l->writer().add_destination( destination::dbg_window() );
- g_l->writer().add_destination( destination::file("out.txt") );
- g_l->turn_cache_off();
+ g_l()->writer().add_destination( destination::cout() );
+ g_l()->writer().add_destination( destination::dbg_window() );
+ g_l()->writer().add_destination( destination::file("out.txt") );
+ g_l()->turn_cache_off();
}
Modified: sandbox/logging/lib/logging/samples/basic_usage/log.h
==============================================================================
--- sandbox/logging/lib/logging/samples/basic_usage/log.h (original)
+++ sandbox/logging/lib/logging/samples/basic_usage/log.h 2008-01-17 02:48:50 EST (Thu, 17 Jan 2008)
@@ -19,9 +19,9 @@
BOOST_DECLARE_LOG(g_l, log_type)
// Step 5: define the macros through which you'll log
-#define LDBG_ BOOST_LOG_USE_LOG_IF_LEVEL(g_l, g_l_filter, debug ) << "[dbg] "
-#define LERR_ BOOST_LOG_USE_LOG_IF_LEVEL(g_l, g_l_filter, error ) << "[ERR] "
-#define LAPP_ BOOST_LOG_USE_LOG_IF_LEVEL(g_l, g_l_filter, info )
+#define LDBG_ BOOST_LOG_USE_LOG_IF_LEVEL(g_l(), g_l_filter(), debug ) << "[dbg] "
+#define LERR_ BOOST_LOG_USE_LOG_IF_LEVEL(g_l(), g_l_filter(), error ) << "[ERR] "
+#define LAPP_ BOOST_LOG_USE_LOG_IF_LEVEL(g_l(), g_l_filter(), info )
void init_logs();
Modified: sandbox/logging/lib/logging/samples/basic_usage/main.cpp
==============================================================================
--- sandbox/logging/lib/logging/samples/basic_usage/main.cpp (original)
+++ sandbox/logging/lib/logging/samples/basic_usage/main.cpp 2008-01-17 02:48:50 EST (Thu, 17 Jan 2008)
@@ -120,7 +120,7 @@
lev_str = "info";
}
}
- g_l_filter->set_enabled(lev);
+ g_l_filter()->set_enabled(lev);
LAPP_ << "Verbosity: " << lev_str;
Modified: sandbox/logging/lib/logging/samples/compile_time/ReadMe.txt
==============================================================================
--- sandbox/logging/lib/logging/samples/compile_time/ReadMe.txt (original)
+++ sandbox/logging/lib/logging/samples/compile_time/ReadMe.txt 2008-01-17 02:48:50 EST (Thu, 17 Jan 2008)
@@ -14,10 +14,11 @@
Debug
Compile with BOOST_LOG_COMPILE_FAST_ON (default) - 33 secs
-
Compile with BOOST_LOG_COMPILE_FAST_OFF - 43 secs
-
+Release
+Compile with BOOST_LOG_COMPILE_FAST_ON (default) - 24 secs
+Compile with BOOST_LOG_COMPILE_FAST_OFF - 29 secs
gcc 3.4.2
Debug
Modified: sandbox/logging/lib/logging/samples/compile_time/basic_usage.vcproj
==============================================================================
--- sandbox/logging/lib/logging/samples/compile_time/basic_usage.vcproj (original)
+++ sandbox/logging/lib/logging/samples/compile_time/basic_usage.vcproj 2008-01-17 02:48:50 EST (Thu, 17 Jan 2008)
@@ -48,7 +48,7 @@
UsePrecompiledHeader="0"
WarningLevel="3"
Detect64BitPortabilityProblems="true"
- DebugInformationFormat="4"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -97,7 +97,7 @@
OutputDirectory="$(SolutionDir)$(ConfigurationName)"
IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="1"
- CharacterSet="1"
+ CharacterSet="2"
WholeProgramOptimization="1"
>
<Tool
@@ -117,6 +117,7 @@
/>
<Tool
Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories=".,../../../.."
PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
RuntimeLibrary="2"
UsePrecompiledHeader="0"
@@ -200,7 +201,7 @@
UsePrecompiledHeader="0"
WarningLevel="3"
Detect64BitPortabilityProblems="true"
- DebugInformationFormat="4"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -244,6 +245,82 @@
Name="VCPostBuildEventTool"
/>
</Configuration>
+ <Configuration
+ Name="ReleaseCompileSlow|Win32"
+ OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)"
+ ConfigurationType="1"
+ CharacterSet="2"
+ WholeProgramOptimization="1"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories=".,../../../.."
+ PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;BOOST_LOG_COMPILE_FAST_OFF"
+ RuntimeLibrary="2"
+ UsePrecompiledHeader="0"
+ WarningLevel="3"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ LinkIncremental="1"
+ GenerateDebugInformation="true"
+ SubSystem="1"
+ OptimizeReferences="2"
+ EnableCOMDATFolding="2"
+ TargetMachine="1"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCWebDeploymentTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
</Configurations>
<References>
</References>
Modified: sandbox/logging/lib/logging/samples/compile_time/compile_time.sln
==============================================================================
--- sandbox/logging/lib/logging/samples/compile_time/compile_time.sln (original)
+++ sandbox/logging/lib/logging/samples/compile_time/compile_time.sln 2008-01-17 02:48:50 EST (Thu, 17 Jan 2008)
@@ -1,13 +1,14 @@

Microsoft Visual Studio Solution File, Format Version 9.00
# Visual Studio 2005
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "basic_usage", "basic_usage.vcproj", "{011E74A4-F775-4EE3-B195-03B308F7D2F0}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "compile_time", "basic_usage.vcproj", "{011E74A4-F775-4EE3-B195-03B308F7D2F0}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
DebugCompileSlow|Win32 = DebugCompileSlow|Win32
Release|Win32 = Release|Win32
+ ReleaseCompileSlow|Win32 = ReleaseCompileSlow|Win32
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{011E74A4-F775-4EE3-B195-03B308F7D2F0}.Debug|Win32.ActiveCfg = Debug|Win32
@@ -16,6 +17,8 @@
{011E74A4-F775-4EE3-B195-03B308F7D2F0}.DebugCompileSlow|Win32.Build.0 = DebugCompileSlow|Win32
{011E74A4-F775-4EE3-B195-03B308F7D2F0}.Release|Win32.ActiveCfg = Release|Win32
{011E74A4-F775-4EE3-B195-03B308F7D2F0}.Release|Win32.Build.0 = Release|Win32
+ {011E74A4-F775-4EE3-B195-03B308F7D2F0}.ReleaseCompileSlow|Win32.ActiveCfg = ReleaseCompileSlow|Win32
+ {011E74A4-F775-4EE3-B195-03B308F7D2F0}.ReleaseCompileSlow|Win32.Build.0 = ReleaseCompileSlow|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Modified: sandbox/logging/lib/logging/samples/compile_time/log.cpp
==============================================================================
--- sandbox/logging/lib/logging/samples/compile_time/log.cpp (original)
+++ sandbox/logging/lib/logging/samples/compile_time/log.cpp 2008-01-17 02:48:50 EST (Thu, 17 Jan 2008)
@@ -12,13 +12,13 @@
void init_logs() {
// Add formatters and destinations
// That is, how the message is to be formatted...
- g_l->writer().add_formatter( formatter::idx() );
- g_l->writer().add_formatter( formatter::time("$hh:$mm.$ss ") );
- g_l->writer().add_formatter( formatter::append_newline() );
+ g_l()->writer().add_formatter( formatter::idx() );
+ g_l()->writer().add_formatter( formatter::time("$hh:$mm.$ss ") );
+ g_l()->writer().add_formatter( formatter::append_newline() );
// ... and where should it be written to
- g_l->writer().add_destination( destination::cout() );
- g_l->writer().add_destination( destination::dbg_window() );
- g_l->writer().add_destination( destination::file("out.txt") );
- g_l->turn_cache_off();
+ g_l()->writer().add_destination( destination::cout() );
+ g_l()->writer().add_destination( destination::dbg_window() );
+ g_l()->writer().add_destination( destination::file("out.txt") );
+ g_l()->turn_cache_off();
}
Modified: sandbox/logging/lib/logging/samples/compile_time/log.h
==============================================================================
--- sandbox/logging/lib/logging/samples/compile_time/log.h (original)
+++ sandbox/logging/lib/logging/samples/compile_time/log.h 2008-01-17 02:48:50 EST (Thu, 17 Jan 2008)
@@ -26,9 +26,9 @@
BOOST_DECLARE_LOG(g_l, finder::logger)
// Step 5: define the macros through which you'll log
-#define LDBG_ BOOST_LOG_USE_LOG_IF_LEVEL(g_l, g_l_filter, debug ) .set_tag( BOOST_LOG_TAG_FILELINE)
-#define LERR_ BOOST_LOG_USE_LOG_IF_LEVEL(g_l, g_l_filter, error ) .set_tag( BOOST_LOG_TAG_FILELINE)
-#define LAPP_ BOOST_LOG_USE_LOG_IF_LEVEL(g_l, g_l_filter, info ) .set_tag( BOOST_LOG_TAG_FILELINE)
+#define LDBG_ BOOST_LOG_USE_LOG_IF_LEVEL(g_l(), g_l_filter(), debug ) .set_tag( BOOST_LOG_TAG_FILELINE)
+#define LERR_ BOOST_LOG_USE_LOG_IF_LEVEL(g_l(), g_l_filter(), error ) .set_tag( BOOST_LOG_TAG_FILELINE)
+#define LAPP_ BOOST_LOG_USE_LOG_IF_LEVEL(g_l(), g_l_filter(), info ) .set_tag( BOOST_LOG_TAG_FILELINE)
void init_logs();
Modified: sandbox/logging/lib/logging/samples/compile_time/original.cpp
==============================================================================
--- sandbox/logging/lib/logging/samples/compile_time/original.cpp (original)
+++ sandbox/logging/lib/logging/samples/compile_time/original.cpp 2008-01-17 02:48:50 EST (Thu, 17 Jan 2008)
@@ -18,11 +18,11 @@
std::string hello = "hello", world = "world";
LAPP_ << hello << ", " << world;
- g_l_filter->set_enabled(level::error);
+ g_l_filter()->set_enabled(level::error);
LDBG_ << "this will not be written anywhere";
LAPP_ << "this won't be written anywhere either";
- g_l_filter->set_enabled(level::info);
+ g_l_filter()->set_enabled(level::info);
LAPP_ << "good to be back ;) " << i++;
LERR_ << "second error " << i++;
@@ -38,11 +38,11 @@
LAPP_ << hello << ", " << world;
- g_l_filter->set_enabled(level::error);
+ g_l_filter()->set_enabled(level::error);
LAPP_ << "this will not be written anywhere";
LAPP_ << "this won't be written anywhere either";
- g_l_filter->set_enabled(level::info);
+ g_l_filter()->set_enabled(level::info);
LAPP_ << "good to be back ;) " << val();
LERR_ << "second error " << val();
Modified: sandbox/logging/lib/logging/samples/starter/log.cpp
==============================================================================
--- sandbox/logging/lib/logging/samples/starter/log.cpp (original)
+++ sandbox/logging/lib/logging/samples/starter/log.cpp 2008-01-17 02:48:50 EST (Thu, 17 Jan 2008)
@@ -17,13 +17,13 @@
void init_logs() {
// Add formatters and destinations
// That is, how the message is to be formatted...
- g_l->writer().add_formatter( formatter::tag::thread_id() );
- g_l->writer().add_formatter( formatter::tag::time("$hh:$mm.$ss ") );
- g_l->writer().add_formatter( formatter::idx() );
- g_l->writer().add_formatter( formatter::append_newline() );
+ g_l()->writer().add_formatter( formatter::tag::thread_id() );
+ g_l()->writer().add_formatter( formatter::tag::time("$hh:$mm.$ss ") );
+ g_l()->writer().add_formatter( formatter::idx() );
+ g_l()->writer().add_formatter( formatter::append_newline() );
// ... and where should it be written to
- g_l->writer().add_destination( destination::cout() );
- g_l->writer().add_destination( destination::dbg_window() );
- g_l->writer().add_destination( destination::file("out.txt") );
+ g_l()->writer().add_destination( destination::cout() );
+ g_l()->writer().add_destination( destination::dbg_window() );
+ g_l()->writer().add_destination( destination::file("out.txt") );
}
Modified: sandbox/logging/lib/logging/samples/starter/log.h
==============================================================================
--- sandbox/logging/lib/logging/samples/starter/log.h (original)
+++ sandbox/logging/lib/logging/samples/starter/log.h 2008-01-17 02:48:50 EST (Thu, 17 Jan 2008)
@@ -44,10 +44,10 @@
// Step 4: declare which filters and loggers you'll use
BOOST_DECLARE_LOG_FILTER(g_l_filter, finder::filter)
-BOOST_DECLARE_LOG(g_l, finder::logger)
+BOOST_DECLARE_LOG(g_l(), finder::logger)
// Step 5: define the macros through which you'll log
-#define L_ BOOST_LOG_USE_LOG_IF_FILTER(g_l, g_log_filter->is_enabled() )
+#define L_ BOOST_LOG_USE_LOG_IF_FILTER(g_l(), g_log_filter()->is_enabled() )
// initialize thy logs..
void init_logs();
Added: sandbox/logging/lib/logging/tests/all_tests.sln
==============================================================================
--- (empty file)
+++ sandbox/logging/lib/logging/tests/all_tests.sln 2008-01-17 02:48:50 EST (Thu, 17 Jan 2008)
@@ -0,0 +1,68 @@
+
+Microsoft Visual Studio Solution File, Format Version 9.00
+# Visual Studio 2005
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_after_destroyed", "test_after_destroyed\test_after_destroyed.vcproj", "{C5897099-5FA2-4E12-AFFC-2015364347FA}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_file", "test_file\test_file.vcproj", "{A098514E-1836-49C4-8309-03291403A994}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_named", "test_named\test_named.vcproj", "{279DABB5-79C6-4188-BB0D-330C5D6C2EFA}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_named_spacer", "test_named_spacer\test_named_spacer.vcproj", "{C0BA2659-1D76-4F04-A39D-12693A15B0DF}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_rolling_file", "test_rolling_file\test_rolling_file.vcproj", "{6C062BD8-60DF-4A71-88FF-E332F737CAEA}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_simple_tss", "test_simple_tss\test_simple_tss.vcproj", "{E091B1F3-E517-4634-B584-841E18F76631}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_tags", "test_tags\test_tags.vcproj", "{6CC1FA5A-5E85-4420-BCD8-2D731E65EA18}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_ts_resource", "test_ts_resouce_with_cache\test_ts_resource.vcproj", "{C24466D5-0243-4D46-AAC0-8A416A731F1C}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_tss", "test_tss\test_tss.vcproj", "{4817A3DF-1CF9-4BF9-98AA-2CF5EE0E742F}"
+EndProject
+Global
+ GlobalSection(SolutionConfigurationPlatforms) = preSolution
+ Debug|Win32 = Debug|Win32
+ Release|Win32 = Release|Win32
+ EndGlobalSection
+ GlobalSection(ProjectConfigurationPlatforms) = postSolution
+ {C5897099-5FA2-4E12-AFFC-2015364347FA}.Debug|Win32.ActiveCfg = Debug|Win32
+ {C5897099-5FA2-4E12-AFFC-2015364347FA}.Debug|Win32.Build.0 = Debug|Win32
+ {C5897099-5FA2-4E12-AFFC-2015364347FA}.Release|Win32.ActiveCfg = Release|Win32
+ {C5897099-5FA2-4E12-AFFC-2015364347FA}.Release|Win32.Build.0 = Release|Win32
+ {A098514E-1836-49C4-8309-03291403A994}.Debug|Win32.ActiveCfg = Debug|Win32
+ {A098514E-1836-49C4-8309-03291403A994}.Debug|Win32.Build.0 = Debug|Win32
+ {A098514E-1836-49C4-8309-03291403A994}.Release|Win32.ActiveCfg = Release|Win32
+ {A098514E-1836-49C4-8309-03291403A994}.Release|Win32.Build.0 = Release|Win32
+ {279DABB5-79C6-4188-BB0D-330C5D6C2EFA}.Debug|Win32.ActiveCfg = Debug|Win32
+ {279DABB5-79C6-4188-BB0D-330C5D6C2EFA}.Debug|Win32.Build.0 = Debug|Win32
+ {279DABB5-79C6-4188-BB0D-330C5D6C2EFA}.Release|Win32.ActiveCfg = Release|Win32
+ {279DABB5-79C6-4188-BB0D-330C5D6C2EFA}.Release|Win32.Build.0 = Release|Win32
+ {C0BA2659-1D76-4F04-A39D-12693A15B0DF}.Debug|Win32.ActiveCfg = Debug|Win32
+ {C0BA2659-1D76-4F04-A39D-12693A15B0DF}.Debug|Win32.Build.0 = Debug|Win32
+ {C0BA2659-1D76-4F04-A39D-12693A15B0DF}.Release|Win32.ActiveCfg = Release|Win32
+ {C0BA2659-1D76-4F04-A39D-12693A15B0DF}.Release|Win32.Build.0 = Release|Win32
+ {6C062BD8-60DF-4A71-88FF-E332F737CAEA}.Debug|Win32.ActiveCfg = Debug|Win32
+ {6C062BD8-60DF-4A71-88FF-E332F737CAEA}.Debug|Win32.Build.0 = Debug|Win32
+ {6C062BD8-60DF-4A71-88FF-E332F737CAEA}.Release|Win32.ActiveCfg = Release|Win32
+ {6C062BD8-60DF-4A71-88FF-E332F737CAEA}.Release|Win32.Build.0 = Release|Win32
+ {E091B1F3-E517-4634-B584-841E18F76631}.Debug|Win32.ActiveCfg = Debug|Win32
+ {E091B1F3-E517-4634-B584-841E18F76631}.Debug|Win32.Build.0 = Debug|Win32
+ {E091B1F3-E517-4634-B584-841E18F76631}.Release|Win32.ActiveCfg = Release|Win32
+ {E091B1F3-E517-4634-B584-841E18F76631}.Release|Win32.Build.0 = Release|Win32
+ {6CC1FA5A-5E85-4420-BCD8-2D731E65EA18}.Debug|Win32.ActiveCfg = Debug|Win32
+ {6CC1FA5A-5E85-4420-BCD8-2D731E65EA18}.Debug|Win32.Build.0 = Debug|Win32
+ {6CC1FA5A-5E85-4420-BCD8-2D731E65EA18}.Release|Win32.ActiveCfg = Release|Win32
+ {6CC1FA5A-5E85-4420-BCD8-2D731E65EA18}.Release|Win32.Build.0 = Release|Win32
+ {C24466D5-0243-4D46-AAC0-8A416A731F1C}.Debug|Win32.ActiveCfg = Debug|Win32
+ {C24466D5-0243-4D46-AAC0-8A416A731F1C}.Debug|Win32.Build.0 = Debug|Win32
+ {C24466D5-0243-4D46-AAC0-8A416A731F1C}.Release|Win32.ActiveCfg = Release|Win32
+ {C24466D5-0243-4D46-AAC0-8A416A731F1C}.Release|Win32.Build.0 = Release|Win32
+ {4817A3DF-1CF9-4BF9-98AA-2CF5EE0E742F}.Debug|Win32.ActiveCfg = Debug|Win32
+ {4817A3DF-1CF9-4BF9-98AA-2CF5EE0E742F}.Debug|Win32.Build.0 = Debug|Win32
+ {4817A3DF-1CF9-4BF9-98AA-2CF5EE0E742F}.Release|Win32.ActiveCfg = Release|Win32
+ {4817A3DF-1CF9-4BF9-98AA-2CF5EE0E742F}.Release|Win32.Build.0 = Release|Win32
+ EndGlobalSection
+ GlobalSection(SolutionProperties) = preSolution
+ HideSolutionNode = FALSE
+ EndGlobalSection
+EndGlobal
Deleted: sandbox/logging/lib/logging/tests/test_after_destroyed/test.vcproj
==============================================================================
--- sandbox/logging/lib/logging/tests/test_after_destroyed/test.vcproj 2008-01-17 02:48:50 EST (Thu, 17 Jan 2008)
+++ (empty file)
@@ -1,182 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
- ProjectType="Visual C++"
- Version="8.00"
- Name="test"
- ProjectGUID="{C5897099-5FA2-4E12-AFFC-2015364347FA}"
- RootNamespace="test"
- Keyword="Win32Proj"
- >
- <Platforms>
- <Platform
- Name="Win32"
- />
- </Platforms>
- <ToolFiles>
- </ToolFiles>
- <Configurations>
- <Configuration
- Name="Debug|Win32"
- OutputDirectory="$(SolutionDir)$(ConfigurationName)"
- IntermediateDirectory="$(ConfigurationName)"
- ConfigurationType="1"
- CharacterSet="2"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=".,../../../.."
- PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
- MinimalRebuild="true"
- BasicRuntimeChecks="3"
- RuntimeLibrary="1"
- UsePrecompiledHeader="0"
- WarningLevel="3"
- Detect64BitPortabilityProblems="true"
- DebugInformationFormat="4"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- LinkIncremental="2"
- AdditionalLibraryDirectories="D:\boosts\boost_1_33_1\bin\boost\libs\thread\build\libboost_thread.lib\vc-8_0\debug\threading-multi"
- GenerateDebugInformation="true"
- SubSystem="1"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- CommandLine="copy "$(TargetPath)" "$(SolutionDir)""
- />
- </Configuration>
- <Configuration
- Name="Release|Win32"
- OutputDirectory="$(SolutionDir)$(ConfigurationName)"
- IntermediateDirectory="$(ConfigurationName)"
- ConfigurationType="1"
- CharacterSet="1"
- WholeProgramOptimization="1"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
- RuntimeLibrary="2"
- UsePrecompiledHeader="0"
- WarningLevel="3"
- Detect64BitPortabilityProblems="true"
- DebugInformationFormat="3"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- LinkIncremental="1"
- GenerateDebugInformation="true"
- SubSystem="1"
- OptimizeReferences="2"
- EnableCOMDATFolding="2"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- </Configurations>
- <References>
- </References>
- <Files>
- <File
- RelativePath=".\test.cpp"
- >
- </File>
- </Files>
- <Globals>
- </Globals>
-</VisualStudioProject>
Copied: sandbox/logging/lib/logging/tests/test_after_destroyed/test_after_destroyed.vcproj (from r42826, /sandbox/logging/lib/logging/tests/test_after_destroyed/test.vcproj)
==============================================================================
--- /sandbox/logging/lib/logging/tests/test_after_destroyed/test.vcproj (original)
+++ sandbox/logging/lib/logging/tests/test_after_destroyed/test_after_destroyed.vcproj 2008-01-17 02:48:50 EST (Thu, 17 Jan 2008)
@@ -2,7 +2,7 @@
<VisualStudioProject
ProjectType="Visual C++"
Version="8.00"
- Name="test"
+ Name="test_after_destroyed"
ProjectGUID="{C5897099-5FA2-4E12-AFFC-2015364347FA}"
RootNamespace="test"
Keyword="Win32Proj"
Modified: sandbox/logging/lib/logging/tests/test_file/test.cpp
==============================================================================
--- sandbox/logging/lib/logging/tests/test_file/test.cpp (original)
+++ sandbox/logging/lib/logging/tests/test_file/test.cpp 2008-01-17 02:48:50 EST (Thu, 17 Jan 2008)
@@ -14,22 +14,22 @@
BOOST_DEFINE_LOG_FILTER(g_log_filter, filter::no_ts )
BOOST_DEFINE_LOG(g_l, log_type)
-#define L_ BOOST_LOG_USE_LOG_IF_FILTER(g_l, g_log_filter->is_enabled() )
+#define L_ BOOST_LOG_USE_LOG_IF_FILTER(g_l(), g_log_filter()->is_enabled() )
void write_to_clean_file() {
// first, write to a clean file (that is, don't append to it)
- g_l->writer().add_destination( destination::file("out.txt", destination::file_settings().initial_overwrite(true) ));
- g_l->writer().add_formatter( formatter::append_newline_if_needed() );
- g_l->writer().add_destination( destination::cout() );
- g_l->turn_cache_off();
+ g_l()->writer().add_destination( destination::file("out.txt", destination::file_settings().initial_overwrite(true) ));
+ g_l()->writer().add_formatter( formatter::append_newline_if_needed() );
+ g_l()->writer().add_destination( destination::cout() );
+ g_l()->turn_cache_off();
// read this .cpp file - every other line is logged (odd lines)
std::ifstream in("test.cpp");
bool enabled = true;
std::string line;
while ( std::getline(in, line) ) {
- g_log_filter->set_enabled(enabled);
+ g_log_filter()->set_enabled(enabled);
L_ << "line odd " << line;
enabled = !enabled;
}
@@ -39,9 +39,9 @@
// second, append to the same file
// ... first, remove old destination
- g_l->writer().del_destination( destination::file("out.txt"));
+ g_l()->writer().del_destination( destination::file("out.txt"));
// ... now, re-add the same file - but now, for appending
- g_l->writer().add_destination( destination::file("out.txt",
+ g_l()->writer().add_destination( destination::file("out.txt",
destination::file_settings().initial_overwrite(false).do_append(true) ));
// read this .cpp file - every other line is logged (even lines now)
@@ -49,13 +49,13 @@
bool enabled = false;
std::string line;
while ( std::getline(in, line) ) {
- g_log_filter->set_enabled(enabled);
+ g_log_filter()->set_enabled(enabled);
L_ << "line even " << line;
enabled = !enabled;
}
- g_l->writer().del_destination( destination::file("out.txt"));
- g_log_filter->set_enabled(true);
+ g_l()->writer().del_destination( destination::file("out.txt"));
+ g_log_filter()->set_enabled(true);
L_ << "should not be written to file, only to console";
}
Deleted: sandbox/logging/lib/logging/tests/test_file/test.vcproj
==============================================================================
--- sandbox/logging/lib/logging/tests/test_file/test.vcproj 2008-01-17 02:48:50 EST (Thu, 17 Jan 2008)
+++ (empty file)
@@ -1,181 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
- ProjectType="Visual C++"
- Version="8.00"
- Name="test_file"
- ProjectGUID="{C5897099-5FA2-4E12-AFFC-2015364347FA}"
- RootNamespace="test"
- Keyword="Win32Proj"
- >
- <Platforms>
- <Platform
- Name="Win32"
- />
- </Platforms>
- <ToolFiles>
- </ToolFiles>
- <Configurations>
- <Configuration
- Name="Debug|Win32"
- OutputDirectory="$(SolutionDir)$(ConfigurationName)"
- IntermediateDirectory="$(ConfigurationName)"
- ConfigurationType="1"
- CharacterSet="2"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=".,../../../.."
- PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
- MinimalRebuild="true"
- BasicRuntimeChecks="3"
- RuntimeLibrary="3"
- UsePrecompiledHeader="0"
- WarningLevel="3"
- Detect64BitPortabilityProblems="true"
- DebugInformationFormat="4"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- LinkIncremental="2"
- AdditionalLibraryDirectories="D:\boosts\boost_1_33_1\bin\boost\libs\thread\build\libboost_thread.lib\vc-8_0\debug\threading-multi"
- GenerateDebugInformation="true"
- SubSystem="1"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- <Configuration
- Name="Release|Win32"
- OutputDirectory="$(SolutionDir)$(ConfigurationName)"
- IntermediateDirectory="$(ConfigurationName)"
- ConfigurationType="1"
- CharacterSet="1"
- WholeProgramOptimization="1"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
- RuntimeLibrary="2"
- UsePrecompiledHeader="0"
- WarningLevel="3"
- Detect64BitPortabilityProblems="true"
- DebugInformationFormat="3"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- LinkIncremental="1"
- GenerateDebugInformation="true"
- SubSystem="1"
- OptimizeReferences="2"
- EnableCOMDATFolding="2"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- </Configurations>
- <References>
- </References>
- <Files>
- <File
- RelativePath=".\test.cpp"
- >
- </File>
- </Files>
- <Globals>
- </Globals>
-</VisualStudioProject>
Copied: sandbox/logging/lib/logging/tests/test_file/test_file.vcproj (from r42797, /sandbox/logging/lib/logging/tests/test_file/test.vcproj)
==============================================================================
--- /sandbox/logging/lib/logging/tests/test_file/test.vcproj (original)
+++ sandbox/logging/lib/logging/tests/test_file/test_file.vcproj 2008-01-17 02:48:50 EST (Thu, 17 Jan 2008)
@@ -3,7 +3,7 @@
ProjectType="Visual C++"
Version="8.00"
Name="test_file"
- ProjectGUID="{C5897099-5FA2-4E12-AFFC-2015364347FA}"
+ ProjectGUID="{A098514E-1836-49C4-8309-03291403A994}"
RootNamespace="test"
Keyword="Win32Proj"
>
Modified: sandbox/logging/lib/logging/tests/test_log_output/test_log_output.cpp
==============================================================================
--- sandbox/logging/lib/logging/tests/test_log_output/test_log_output.cpp (original)
+++ sandbox/logging/lib/logging/tests/test_log_output/test_log_output.cpp 2008-01-17 02:48:50 EST (Thu, 17 Jan 2008)
@@ -37,15 +37,15 @@
BOOST_DEFINE_LOG_FILTER(g_log_filter, filter::no_ts )
BOOST_DEFINE_LOG(g_l, log_type)
-#define L_ BOOST_LOG_USE_LOG_IF_FILTER(g_l, g_log_filter->is_enabled() )
+#define L_ BOOST_LOG_USE_LOG_IF_FILTER(g_l(), g_log_filter()->is_enabled() )
void test_log_output() {
std::ostringstream out_str;
destination::stream dest_out(out_str);
- g_l->writer().add_formatter( formatter::idx() );
- g_l->writer().add_formatter( formatter::append_newline() );
- g_l->writer().add_destination( destination::cout() );
- g_l->writer().add_destination( dest_out );
+ g_l()->writer().add_formatter( formatter::idx() );
+ g_l()->writer().add_formatter( formatter::append_newline() );
+ g_l()->writer().add_destination( destination::cout() );
+ g_l()->writer().add_destination( dest_out );
// Step 8: use it...
int i = 1;
Modified: sandbox/logging/lib/logging/tests/test_named/test.cpp
==============================================================================
--- sandbox/logging/lib/logging/tests/test_named/test.cpp (original)
+++ sandbox/logging/lib/logging/tests/test_named/test.cpp 2008-01-17 02:48:50 EST (Thu, 17 Jan 2008)
@@ -14,7 +14,7 @@
BOOST_DEFINE_LOG_FILTER(g_log_filter, finder::filter )
BOOST_DEFINE_LOG(g_l, finder::logger )
-#define L_ BOOST_LOG_USE_LOG_IF_FILTER(g_l, g_log_filter->is_enabled() )
+#define L_ BOOST_LOG_USE_LOG_IF_FILTER(g_l(), g_log_filter()->is_enabled() )
std::stringstream g_first;
@@ -27,14 +27,14 @@
std::string g_msg = "hello world";
void init_logs() {
- g_l->writer().add_destination( g_n
+ g_l()->writer().add_destination( g_n
.add( "first", destination::stream(g_first) )
.add( "second", destination::stream(g_second) )
.add( "third", destination::stream(g_third) ));
- g_l->writer().add_formatter( formatter::append_newline() );
- g_l->writer().add_destination( destination::cout() );
- g_l->turn_cache_off();
+ g_l()->writer().add_formatter( formatter::append_newline() );
+ g_l()->writer().add_destination( destination::cout() );
+ g_l()->turn_cache_off();
}
void test_use_all() {
Deleted: sandbox/logging/lib/logging/tests/test_named/test.vcproj
==============================================================================
--- sandbox/logging/lib/logging/tests/test_named/test.vcproj 2008-01-17 02:48:50 EST (Thu, 17 Jan 2008)
+++ (empty file)
@@ -1,181 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
- ProjectType="Visual C++"
- Version="8.00"
- Name="test_named"
- ProjectGUID="{C5897099-5FA2-4E12-AFFC-2015364347FA}"
- RootNamespace="test"
- Keyword="Win32Proj"
- >
- <Platforms>
- <Platform
- Name="Win32"
- />
- </Platforms>
- <ToolFiles>
- </ToolFiles>
- <Configurations>
- <Configuration
- Name="Debug|Win32"
- OutputDirectory="$(SolutionDir)$(ConfigurationName)"
- IntermediateDirectory="$(ConfigurationName)"
- ConfigurationType="1"
- CharacterSet="2"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=".,../../../.."
- PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
- MinimalRebuild="true"
- BasicRuntimeChecks="3"
- RuntimeLibrary="3"
- UsePrecompiledHeader="0"
- WarningLevel="3"
- Detect64BitPortabilityProblems="true"
- DebugInformationFormat="4"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- LinkIncremental="2"
- AdditionalLibraryDirectories="D:\boosts\boost_1_33_1\bin\boost\libs\thread\build\libboost_thread.lib\vc-8_0\debug\threading-multi"
- GenerateDebugInformation="true"
- SubSystem="1"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- <Configuration
- Name="Release|Win32"
- OutputDirectory="$(SolutionDir)$(ConfigurationName)"
- IntermediateDirectory="$(ConfigurationName)"
- ConfigurationType="1"
- CharacterSet="1"
- WholeProgramOptimization="1"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
- RuntimeLibrary="2"
- UsePrecompiledHeader="0"
- WarningLevel="3"
- Detect64BitPortabilityProblems="true"
- DebugInformationFormat="3"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- LinkIncremental="1"
- GenerateDebugInformation="true"
- SubSystem="1"
- OptimizeReferences="2"
- EnableCOMDATFolding="2"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- </Configurations>
- <References>
- </References>
- <Files>
- <File
- RelativePath=".\test.cpp"
- >
- </File>
- </Files>
- <Globals>
- </Globals>
-</VisualStudioProject>
Copied: sandbox/logging/lib/logging/tests/test_named/test_named.vcproj (from r42797, /sandbox/logging/lib/logging/tests/test_named/test.vcproj)
==============================================================================
--- /sandbox/logging/lib/logging/tests/test_named/test.vcproj (original)
+++ sandbox/logging/lib/logging/tests/test_named/test_named.vcproj 2008-01-17 02:48:50 EST (Thu, 17 Jan 2008)
@@ -3,7 +3,7 @@
ProjectType="Visual C++"
Version="8.00"
Name="test_named"
- ProjectGUID="{C5897099-5FA2-4E12-AFFC-2015364347FA}"
+ ProjectGUID="{279DABB5-79C6-4188-BB0D-330C5D6C2EFA}"
RootNamespace="test"
Keyword="Win32Proj"
>
Modified: sandbox/logging/lib/logging/tests/test_named_spacer/test.cpp
==============================================================================
--- sandbox/logging/lib/logging/tests/test_named_spacer/test.cpp (original)
+++ sandbox/logging/lib/logging/tests/test_named_spacer/test.cpp 2008-01-17 02:48:50 EST (Thu, 17 Jan 2008)
@@ -13,7 +13,7 @@
BOOST_DEFINE_LOG_FILTER(g_log_filter, finder::filter )
BOOST_DEFINE_LOG(g_l, finder::logger )
-#define L_ BOOST_LOG_USE_LOG_IF_FILTER(g_l, g_log_filter->is_enabled() )
+#define L_ BOOST_LOG_USE_LOG_IF_FILTER(g_l(), g_log_filter()->is_enabled() )
// whatever we log, is logged here too (easy was to find out all the info that was logged)
@@ -43,14 +43,14 @@
std::string g_thread_id;
void init_logs() {
- g_l->writer().add_formatter( g_ns
+ g_l()->writer().add_formatter( g_ns
.add( "idx", formatter::idx() )
.add( "tid", formatter::thread_id() )
.add( "abc", abc() ));
- g_l->writer().add_formatter( formatter::append_newline() );
- g_l->writer().add_destination( destination::stream(g_out) );
- g_l->writer().add_destination( destination::cout() );
- g_l->turn_cache_off();
+ g_l()->writer().add_formatter( formatter::append_newline() );
+ g_l()->writer().add_destination( destination::stream(g_out) );
+ g_l()->writer().add_destination( destination::cout() );
+ g_l()->turn_cache_off();
}
void test_with_all_formatters() {
Deleted: sandbox/logging/lib/logging/tests/test_named_spacer/test.vcproj
==============================================================================
--- sandbox/logging/lib/logging/tests/test_named_spacer/test.vcproj 2008-01-17 02:48:50 EST (Thu, 17 Jan 2008)
+++ (empty file)
@@ -1,181 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
- ProjectType="Visual C++"
- Version="8.00"
- Name="test_named_spacer"
- ProjectGUID="{C5897099-5FA2-4E12-AFFC-2015364347FA}"
- RootNamespace="test"
- Keyword="Win32Proj"
- >
- <Platforms>
- <Platform
- Name="Win32"
- />
- </Platforms>
- <ToolFiles>
- </ToolFiles>
- <Configurations>
- <Configuration
- Name="Debug|Win32"
- OutputDirectory="$(SolutionDir)$(ConfigurationName)"
- IntermediateDirectory="$(ConfigurationName)"
- ConfigurationType="1"
- CharacterSet="2"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=".,../../../.."
- PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
- MinimalRebuild="true"
- BasicRuntimeChecks="3"
- RuntimeLibrary="3"
- UsePrecompiledHeader="0"
- WarningLevel="3"
- Detect64BitPortabilityProblems="true"
- DebugInformationFormat="4"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- LinkIncremental="2"
- AdditionalLibraryDirectories="D:\boosts\boost_1_33_1\bin\boost\libs\thread\build\libboost_thread.lib\vc-8_0\debug\threading-multi"
- GenerateDebugInformation="true"
- SubSystem="1"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- <Configuration
- Name="Release|Win32"
- OutputDirectory="$(SolutionDir)$(ConfigurationName)"
- IntermediateDirectory="$(ConfigurationName)"
- ConfigurationType="1"
- CharacterSet="1"
- WholeProgramOptimization="1"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
- RuntimeLibrary="2"
- UsePrecompiledHeader="0"
- WarningLevel="3"
- Detect64BitPortabilityProblems="true"
- DebugInformationFormat="3"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- LinkIncremental="1"
- GenerateDebugInformation="true"
- SubSystem="1"
- OptimizeReferences="2"
- EnableCOMDATFolding="2"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- </Configurations>
- <References>
- </References>
- <Files>
- <File
- RelativePath=".\test.cpp"
- >
- </File>
- </Files>
- <Globals>
- </Globals>
-</VisualStudioProject>
Copied: sandbox/logging/lib/logging/tests/test_named_spacer/test_named_spacer.vcproj (from r42797, /sandbox/logging/lib/logging/tests/test_named_spacer/test.vcproj)
==============================================================================
--- /sandbox/logging/lib/logging/tests/test_named_spacer/test.vcproj (original)
+++ sandbox/logging/lib/logging/tests/test_named_spacer/test_named_spacer.vcproj 2008-01-17 02:48:50 EST (Thu, 17 Jan 2008)
@@ -3,7 +3,7 @@
ProjectType="Visual C++"
Version="8.00"
Name="test_named_spacer"
- ProjectGUID="{C5897099-5FA2-4E12-AFFC-2015364347FA}"
+ ProjectGUID="{C0BA2659-1D76-4F04-A39D-12693A15B0DF}"
RootNamespace="test"
Keyword="Win32Proj"
>
Modified: sandbox/logging/lib/logging/tests/test_rolling_file/test.cpp
==============================================================================
--- sandbox/logging/lib/logging/tests/test_rolling_file/test.cpp (original)
+++ sandbox/logging/lib/logging/tests/test_rolling_file/test.cpp 2008-01-17 02:48:50 EST (Thu, 17 Jan 2008)
@@ -22,7 +22,7 @@
BOOST_DEFINE_LOG_FILTER(g_log_filter, filter::no_ts )
BOOST_DEFINE_LOG(g_l, log_type)
-#define L_ BOOST_LOG_USE_LOG_IF_FILTER(g_l, g_log_filter->is_enabled() )
+#define L_ BOOST_LOG_USE_LOG_IF_FILTER(g_l(), g_log_filter()->is_enabled() )
// whatever we log to the rolling file, we log here too (easy was to find out all the info that was logged)
std::stringstream g_stringstream;
@@ -39,7 +39,7 @@
const char NEXT_LINE = '\n';
void init_logs() {
- g_l->writer().add_destination(
+ g_l()->writer().add_destination(
destination::rolling_file("out.txt",
destination::rolling_file_settings()
.initial_erase(true)
@@ -48,10 +48,10 @@
.flush_each_time(true)
.extra_flags(std::ios_base::binary)
));
- g_l->writer().add_formatter( formatter::idx(), "[%] " );
- g_l->writer().add_destination( destination::stream(g_stringstream) );
- g_l->writer().add_destination( destination::cout() );
- g_l->turn_cache_off();
+ g_l()->writer().add_formatter( formatter::idx(), "[%] " );
+ g_l()->writer().add_destination( destination::stream(g_stringstream) );
+ g_l()->writer().add_destination( destination::cout() );
+ g_l()->turn_cache_off();
}
void write_to_clean_rolling_file() {
@@ -60,16 +60,16 @@
bool enabled = true;
std::string line;
while ( std::getline(in, line) ) {
- g_log_filter->set_enabled(enabled);
+ g_log_filter()->set_enabled(enabled);
L_ << "line odd " << line << NEXT_LINE;
enabled = !enabled;
}
- g_log_filter->set_enabled(true);
+ g_log_filter()->set_enabled(true);
}
void write_to_existing_rolling_file() {
- g_l->writer().del_destination( destination::rolling_file("out.txt") );
- g_l->writer().add_destination(
+ g_l()->writer().del_destination( destination::rolling_file("out.txt") );
+ g_l()->writer().add_destination(
destination::rolling_file("out.txt",
destination::rolling_file_settings()
.initial_erase(false)
@@ -84,11 +84,11 @@
bool enabled = false;
std::string line;
while ( std::getline(in, line) ) {
- g_log_filter->set_enabled(enabled);
+ g_log_filter()->set_enabled(enabled);
L_ << "line even " << line << NEXT_LINE;
enabled = !enabled;
}
- g_log_filter->set_enabled(true);
+ g_log_filter()->set_enabled(true);
}
// a bit of white-box testing - we need to know the file names - when dealing with a rolling file
@@ -162,8 +162,8 @@
}
// right now, we know for sure that all files are too big - thus, when logging, we should end up writing to first file first
- g_l->writer().del_destination( destination::rolling_file("out.txt") );
- g_l->writer().add_destination(
+ g_l()->writer().del_destination( destination::rolling_file("out.txt") );
+ g_l()->writer().add_destination(
destination::rolling_file("out.txt",
destination::rolling_file_settings()
.initial_erase(false)
@@ -173,7 +173,7 @@
.extra_flags(std::ios_base::binary)
));
// remember what's written starting now
- g_l->writer().add_destination( destination::stream(g_after_full) );
+ g_l()->writer().add_destination( destination::stream(g_after_full) );
//
// and right now, do some logging
Deleted: sandbox/logging/lib/logging/tests/test_rolling_file/test.vcproj
==============================================================================
--- sandbox/logging/lib/logging/tests/test_rolling_file/test.vcproj 2008-01-17 02:48:50 EST (Thu, 17 Jan 2008)
+++ (empty file)
@@ -1,181 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
- ProjectType="Visual C++"
- Version="8.00"
- Name="test_rolling_file"
- ProjectGUID="{C5897099-5FA2-4E12-AFFC-2015364347FA}"
- RootNamespace="test"
- Keyword="Win32Proj"
- >
- <Platforms>
- <Platform
- Name="Win32"
- />
- </Platforms>
- <ToolFiles>
- </ToolFiles>
- <Configurations>
- <Configuration
- Name="Debug|Win32"
- OutputDirectory="$(SolutionDir)$(ConfigurationName)"
- IntermediateDirectory="$(ConfigurationName)"
- ConfigurationType="1"
- CharacterSet="2"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=".,../../../.."
- PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
- MinimalRebuild="true"
- BasicRuntimeChecks="3"
- RuntimeLibrary="3"
- UsePrecompiledHeader="0"
- WarningLevel="3"
- Detect64BitPortabilityProblems="true"
- DebugInformationFormat="4"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- LinkIncremental="2"
- AdditionalLibraryDirectories="D:\boosts\boost_1_33_1\bin\boost\libs\thread\build\libboost_thread.lib\vc-8_0\debug\threading-multi;D:\boosts\boost_1_33_1\bin\boost\libs\filesystem\build\libboost_filesystem.lib\vc-8_0\debug\threading-multi"
- GenerateDebugInformation="true"
- SubSystem="1"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- <Configuration
- Name="Release|Win32"
- OutputDirectory="$(SolutionDir)$(ConfigurationName)"
- IntermediateDirectory="$(ConfigurationName)"
- ConfigurationType="1"
- CharacterSet="1"
- WholeProgramOptimization="1"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
- RuntimeLibrary="2"
- UsePrecompiledHeader="0"
- WarningLevel="3"
- Detect64BitPortabilityProblems="true"
- DebugInformationFormat="3"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- LinkIncremental="1"
- GenerateDebugInformation="true"
- SubSystem="1"
- OptimizeReferences="2"
- EnableCOMDATFolding="2"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- </Configurations>
- <References>
- </References>
- <Files>
- <File
- RelativePath=".\test.cpp"
- >
- </File>
- </Files>
- <Globals>
- </Globals>
-</VisualStudioProject>
Copied: sandbox/logging/lib/logging/tests/test_rolling_file/test_rolling_file.vcproj (from r42797, /sandbox/logging/lib/logging/tests/test_rolling_file/test.vcproj)
==============================================================================
--- /sandbox/logging/lib/logging/tests/test_rolling_file/test.vcproj (original)
+++ sandbox/logging/lib/logging/tests/test_rolling_file/test_rolling_file.vcproj 2008-01-17 02:48:50 EST (Thu, 17 Jan 2008)
@@ -3,7 +3,7 @@
ProjectType="Visual C++"
Version="8.00"
Name="test_rolling_file"
- ProjectGUID="{C5897099-5FA2-4E12-AFFC-2015364347FA}"
+ ProjectGUID="{6C062BD8-60DF-4A71-88FF-E332F737CAEA}"
RootNamespace="test"
Keyword="Win32Proj"
>
Deleted: sandbox/logging/lib/logging/tests/test_tags/test.vcproj
==============================================================================
--- sandbox/logging/lib/logging/tests/test_tags/test.vcproj 2008-01-17 02:48:50 EST (Thu, 17 Jan 2008)
+++ (empty file)
@@ -1,181 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
- ProjectType="Visual C++"
- Version="8.00"
- Name="test_tags"
- ProjectGUID="{C5897099-5FA2-4E12-AFFC-2015364347FA}"
- RootNamespace="test"
- Keyword="Win32Proj"
- >
- <Platforms>
- <Platform
- Name="Win32"
- />
- </Platforms>
- <ToolFiles>
- </ToolFiles>
- <Configurations>
- <Configuration
- Name="Debug|Win32"
- OutputDirectory="$(SolutionDir)$(ConfigurationName)"
- IntermediateDirectory="$(ConfigurationName)"
- ConfigurationType="1"
- CharacterSet="2"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=".,../../../.."
- PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
- MinimalRebuild="true"
- BasicRuntimeChecks="3"
- RuntimeLibrary="3"
- UsePrecompiledHeader="0"
- WarningLevel="3"
- Detect64BitPortabilityProblems="true"
- DebugInformationFormat="4"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- LinkIncremental="2"
- AdditionalLibraryDirectories="D:\boosts\boost_1_33_1\bin\boost\libs\thread\build\libboost_thread.lib\vc-8_0\debug\threading-multi"
- GenerateDebugInformation="true"
- SubSystem="1"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- <Configuration
- Name="Release|Win32"
- OutputDirectory="$(SolutionDir)$(ConfigurationName)"
- IntermediateDirectory="$(ConfigurationName)"
- ConfigurationType="1"
- CharacterSet="1"
- WholeProgramOptimization="1"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
- RuntimeLibrary="2"
- UsePrecompiledHeader="0"
- WarningLevel="3"
- Detect64BitPortabilityProblems="true"
- DebugInformationFormat="3"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- LinkIncremental="1"
- GenerateDebugInformation="true"
- SubSystem="1"
- OptimizeReferences="2"
- EnableCOMDATFolding="2"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- </Configurations>
- <References>
- </References>
- <Files>
- <File
- RelativePath=".\test_tags.cpp"
- >
- </File>
- </Files>
- <Globals>
- </Globals>
-</VisualStudioProject>
Modified: sandbox/logging/lib/logging/tests/test_tags/test_tags.cpp
==============================================================================
--- sandbox/logging/lib/logging/tests/test_tags/test_tags.cpp (original)
+++ sandbox/logging/lib/logging/tests/test_tags/test_tags.cpp 2008-01-17 02:48:50 EST (Thu, 17 Jan 2008)
@@ -29,10 +29,10 @@
// this macro is used to write the file/line and function
-#define LOG_FILE_FUNC_ BOOST_LOG_USE_LOG_IF_FILTER(g_l, g_log_filter->is_enabled() ) .set_tag( BOOST_LOG_TAG_FILELINE) .set_tag( BOOST_LOG_TAG_FUNCTION)
+#define LOG_FILE_FUNC_ BOOST_LOG_USE_LOG_IF_FILTER(g_l(), g_log_filter()->is_enabled() ) .set_tag( BOOST_LOG_TAG_FILELINE) .set_tag( BOOST_LOG_TAG_FUNCTION)
// this macro is used to write module and thread id
-#define LOG_MODULE_(mod) BOOST_LOG_USE_LOG_IF_FILTER(g_l, g_log_filter->is_enabled() ) .set_tag( BOOST_LOG_TAG(module)(mod) )
+#define LOG_MODULE_(mod) BOOST_LOG_USE_LOG_IF_FILTER(g_l(), g_log_filter()->is_enabled() ) .set_tag( BOOST_LOG_TAG(module)(mod) )
// whatever we log, is logged here too (easy was to find out all the info that was logged)
@@ -42,12 +42,12 @@
std::string g_msg = "hello world";
void init_logs_fileline_function() {
- g_l->writer().add_formatter( formatter::tag::file_line()); //, "[%] " );
- g_l->writer().add_formatter( formatter::tag::function()); //, "% " );
- g_l->writer().add_formatter( formatter::append_newline() );
- g_l->writer().add_destination( destination::stream(g_out) );
- g_l->writer().add_destination( destination::cout() );
- g_l->turn_cache_off();
+ g_l()->writer().add_formatter( formatter::tag::file_line()); //, "[%] " );
+ g_l()->writer().add_formatter( formatter::tag::function()); //, "% " );
+ g_l()->writer().add_formatter( formatter::append_newline() );
+ g_l()->writer().add_destination( destination::stream(g_out) );
+ g_l()->writer().add_destination( destination::cout() );
+ g_l()->turn_cache_off();
}
// the str should contain
@@ -70,8 +70,8 @@
void init_logs_module_thread_id() {
- g_l->writer().del_formatter( formatter::tag::file_line() );
- g_l->writer().del_formatter( formatter::tag::function() );
+ g_l()->writer().del_formatter( formatter::tag::file_line() );
+ g_l()->writer().del_formatter( formatter::tag::function() );
// after deleting the file/line and function formatters, they shouldn't be called
LOG_FILE_FUNC_ << g_msg;
@@ -79,8 +79,8 @@
BOOST_ASSERT( !test_str_contains( g_out.str(), "test_fileline_function"));
g_out.str("");
- g_l->writer().add_formatter( formatter::tag::module(), "[%] " );
- g_l->writer().add_formatter( formatter::tag::thread_id(), "[%] " );
+ g_l()->writer().add_formatter( formatter::tag::module(), "[%] " );
+ g_l()->writer().add_formatter( formatter::tag::thread_id(), "[%] " );
}
void test_module_and_thread_id() {
Copied: sandbox/logging/lib/logging/tests/test_tags/test_tags.vcproj (from r42797, /sandbox/logging/lib/logging/tests/test_tags/test.vcproj)
==============================================================================
--- /sandbox/logging/lib/logging/tests/test_tags/test.vcproj (original)
+++ sandbox/logging/lib/logging/tests/test_tags/test_tags.vcproj 2008-01-17 02:48:50 EST (Thu, 17 Jan 2008)
@@ -3,7 +3,7 @@
ProjectType="Visual C++"
Version="8.00"
Name="test_tags"
- ProjectGUID="{C5897099-5FA2-4E12-AFFC-2015364347FA}"
+ ProjectGUID="{6CC1FA5A-5E85-4420-BCD8-2D731E65EA18}"
RootNamespace="test"
Keyword="Win32Proj"
>
Deleted: sandbox/logging/lib/logging/tests/test_template/test.vcproj
==============================================================================
--- sandbox/logging/lib/logging/tests/test_template/test.vcproj 2008-01-17 02:48:50 EST (Thu, 17 Jan 2008)
+++ (empty file)
@@ -1,181 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
- ProjectType="Visual C++"
- Version="8.00"
- Name="test"
- ProjectGUID="{C5897099-5FA2-4E12-AFFC-2015364347FA}"
- RootNamespace="test"
- Keyword="Win32Proj"
- >
- <Platforms>
- <Platform
- Name="Win32"
- />
- </Platforms>
- <ToolFiles>
- </ToolFiles>
- <Configurations>
- <Configuration
- Name="Debug|Win32"
- OutputDirectory="$(SolutionDir)$(ConfigurationName)"
- IntermediateDirectory="$(ConfigurationName)"
- ConfigurationType="1"
- CharacterSet="2"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=".,../../../.."
- PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
- MinimalRebuild="true"
- BasicRuntimeChecks="3"
- RuntimeLibrary="3"
- UsePrecompiledHeader="0"
- WarningLevel="3"
- Detect64BitPortabilityProblems="true"
- DebugInformationFormat="4"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- LinkIncremental="2"
- AdditionalLibraryDirectories="D:\boosts\boost_1_33_1\bin\boost\libs\thread\build\libboost_thread.lib\vc-8_0\debug\threading-multi"
- GenerateDebugInformation="true"
- SubSystem="1"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- <Configuration
- Name="Release|Win32"
- OutputDirectory="$(SolutionDir)$(ConfigurationName)"
- IntermediateDirectory="$(ConfigurationName)"
- ConfigurationType="1"
- CharacterSet="1"
- WholeProgramOptimization="1"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
- RuntimeLibrary="2"
- UsePrecompiledHeader="0"
- WarningLevel="3"
- Detect64BitPortabilityProblems="true"
- DebugInformationFormat="3"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- LinkIncremental="1"
- GenerateDebugInformation="true"
- SubSystem="1"
- OptimizeReferences="2"
- EnableCOMDATFolding="2"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- </Configurations>
- <References>
- </References>
- <Files>
- <File
- RelativePath=".\test.cpp"
- >
- </File>
- </Files>
- <Globals>
- </Globals>
-</VisualStudioProject>
Modified: sandbox/logging/lib/logging/tests/test_tss/test_tss.cpp
==============================================================================
--- sandbox/logging/lib/logging/tests/test_tss/test_tss.cpp (original)
+++ sandbox/logging/lib/logging/tests/test_tss/test_tss.cpp 2008-01-17 02:48:50 EST (Thu, 17 Jan 2008)
@@ -53,7 +53,7 @@
using namespace boost;
// creating this (a log, or a filter), makes sure we initialize TSS
-BOOST_DEFINE_LOG_FILTER_WITH_ARGS(g_log_filter, filter::use_tss_with_cache , 10)
+BOOST_DEFINE_LOG_FILTER_WITH_ARGS(g_log_filter, logging::filter::use_tss_with_cache<> , 10)
extern object_count * g_object_count ;
extern object_count * g_running_thread_count ;
Boost-Commit list run by bdawes at acm.org, david.abrahams at rcn.com, gregod at cs.rpi.edu, cpdaniel at pacbell.net, john at johnmaddock.co.uk