|
|
Boost-Commit : |
From: john.groups_at_[hidden]
Date: 2007-10-30 13:18:34
Author: jtorjo
Date: 2007-10-30 13:18:33 EDT (Tue, 30 Oct 2007)
New Revision: 40610
URL: http://svn.boost.org/trac/boost/changeset/40610
Log:
[logging]
v0.9.7, 30 oct 2007
- added small things to make it compile with gcc 4.1 and 4.3
(note: I just solved some errors that were pointed out by Jens Seidel, not sure if this fixed everything)
Added:
sandbox/logging/lib/logging/tests/do_not_use/
- copied from r40605, /sandbox/logging/lib/logging/tests/donot_use/
Removed:
sandbox/logging/lib/logging/tests/donot_use/
Text files modified:
sandbox/logging/boost/logging/changelog.hpp | 4 ++++
sandbox/logging/boost/logging/detail/manipulator.hpp | 6 ++++++
sandbox/logging/boost/logging/format/array.hpp | 1 +
sandbox/logging/boost/logging/format/destination/rolling_file.hpp | 4 ++--
sandbox/logging/boost/logging/format/formatter/time.hpp | 1 +
sandbox/logging/boost/logging/ts/ts.hpp | 2 +-
sandbox/logging/boost/logging/writer/format_write.hpp | 2 +-
sandbox/logging/boost/logging/writer/on_dedicated_thread.hpp | 1 +
sandbox/logging/boost/logging/writer/ts_write.hpp | 4 ++--
9 files changed, 19 insertions(+), 6 deletions(-)
Modified: sandbox/logging/boost/logging/changelog.hpp
==============================================================================
--- sandbox/logging/boost/logging/changelog.hpp (original)
+++ sandbox/logging/boost/logging/changelog.hpp 2007-10-30 13:18:33 EDT (Tue, 30 Oct 2007)
@@ -1,6 +1,10 @@
/**
@page page_changelog Changelog
+v0.9.7, 30 oct 2007
+- added small things to make it compile with gcc 4.1 and 4.3
+ (note: I just solved some errors that were pointed out by Jens Seidel, not sure if this fixed everything)
+
v0.9.6, 30 oct 2007
- removed garbage from stdafx.h files - so that it can be compiled under Linux
Modified: sandbox/logging/boost/logging/detail/manipulator.hpp
==============================================================================
--- sandbox/logging/boost/logging/detail/manipulator.hpp (original)
+++ sandbox/logging/boost/logging/detail/manipulator.hpp 2007-10-30 13:18:33 EDT (Tue, 30 Oct 2007)
@@ -29,6 +29,12 @@
#include <boost/logging/detail/fwd.hpp>
#include <boost/logging/detail/format_msg_type.hpp>
+#include <boost/logging/format/op_equal.hpp>
+#include <boost/logging/detail/forward_constructor.hpp> // BOOST_LOGGING_FORWARD_CONSTRUCTOR_WITH_NEW
+#include <boost/shared_ptr.hpp>
+#include <boost/type_traits/remove_const.hpp>
+
+
namespace boost { namespace logging {
Modified: sandbox/logging/boost/logging/format/array.hpp
==============================================================================
--- sandbox/logging/boost/logging/format/array.hpp (original)
+++ sandbox/logging/boost/logging/format/array.hpp 2007-10-30 13:18:33 EDT (Tue, 30 Oct 2007)
@@ -22,6 +22,7 @@
#include <boost/logging/detail/fwd.hpp>
#include <boost/shared_ptr.hpp>
+#include <vector>
namespace boost { namespace logging {
Modified: sandbox/logging/boost/logging/format/destination/rolling_file.hpp
==============================================================================
--- sandbox/logging/boost/logging/format/destination/rolling_file.hpp (original)
+++ sandbox/logging/boost/logging/format/destination/rolling_file.hpp 2007-10-30 13:18:33 EDT (Tue, 30 Oct 2007)
@@ -103,7 +103,7 @@
template<class msg_type> void write( const msg_type& msg) {
convert_dest::write(msg, (*m_out) );
- if ( m_out->tellg() > m_flags.max_size_bytes()) {
+ if ( m_out->tellp() > m_flags.max_size_bytes()) {
m_cur_idx = (m_cur_idx + 1) % m_flags.file_count();
recreate_file();
}
@@ -138,7 +138,7 @@
rolling_file_t(const std::string & name_prefix, rolling_file_settings flags = rolling_file_settings() ) : non_const_context_base(name_prefix, flags) {}
template<class msg_type> void operator()( const msg_type & msg) const {
- non_const_context::context().write(msg);
+ non_const_context_base::context().write(msg);
}
bool operator==(const rolling_file_t & other) const {
Modified: sandbox/logging/boost/logging/format/formatter/time.hpp
==============================================================================
--- sandbox/logging/boost/logging/format/formatter/time.hpp (original)
+++ sandbox/logging/boost/logging/format/formatter/time.hpp 2007-10-30 13:18:33 EDT (Tue, 30 Oct 2007)
@@ -23,6 +23,7 @@
#include <boost/logging/detail/fwd.hpp>
#include <boost/logging/format/formatter/convert_format.hpp>
+#include <boost/logging/detail/manipulator.hpp> // is_generic
#include <stdio.h>
#include <time.h>
Modified: sandbox/logging/boost/logging/ts/ts.hpp
==============================================================================
--- sandbox/logging/boost/logging/ts/ts.hpp (original)
+++ sandbox/logging/boost/logging/ts/ts.hpp 2007-10-30 13:18:33 EDT (Tue, 30 Oct 2007)
@@ -37,7 +37,7 @@
#else
// no threads
- #include <boost/log/ts/ts_none.hpp>
+ #include <boost/logging/ts/ts_none.hpp>
#endif
Modified: sandbox/logging/boost/logging/writer/format_write.hpp
==============================================================================
--- sandbox/logging/boost/logging/writer/format_write.hpp (original)
+++ sandbox/logging/boost/logging/writer/format_write.hpp 2007-10-30 13:18:33 EDT (Tue, 30 Oct 2007)
@@ -118,7 +118,7 @@
template<
class formatter_base,
class destination_base,
- class apply_format_and_write = boost::logging::format_and_write::simple<typename formatter_base::raw_param>,
+ class apply_format_and_write = ::boost::logging::format_and_write::simple<typename formatter_base::raw_param>,
class router_type = msg_route::simple<formatter_base, destination_base> ,
class formatter_array = array::shared_ptr_holder<formatter_base> ,
class destination_array = array::shared_ptr_holder<destination_base> >
Modified: sandbox/logging/boost/logging/writer/on_dedicated_thread.hpp
==============================================================================
--- sandbox/logging/boost/logging/writer/on_dedicated_thread.hpp (original)
+++ sandbox/logging/boost/logging/writer/on_dedicated_thread.hpp 2007-10-30 13:18:33 EDT (Tue, 30 Oct 2007)
@@ -27,6 +27,7 @@
#include <boost/thread/thread.hpp>
#include <boost/thread/xtime.hpp>
#include <boost/bind.hpp>
+#include <boost/logging/detail/manipulator.hpp> // boost::logging::manipulator
namespace boost { namespace logging { namespace writer {
Modified: sandbox/logging/boost/logging/writer/ts_write.hpp
==============================================================================
--- sandbox/logging/boost/logging/writer/ts_write.hpp (original)
+++ sandbox/logging/boost/logging/writer/ts_write.hpp 2007-10-30 13:18:33 EDT (Tue, 30 Oct 2007)
@@ -70,8 +70,8 @@
@sa on_dedicated_thread
*/
- template<class base_type> struct ts_write : base_type, non_const_context<detail::ts_write_context> {
- typedef non_const_context<detail::ts_write_context> non_const_context_base;
+ template<class base_type> struct ts_write : base_type, ::boost::logging::manipulator::non_const_context<detail::ts_write_context> {
+ typedef ::boost::logging::manipulator::non_const_context<detail::ts_write_context> non_const_context_base;
BOOST_LOGGING_FORWARD_CONSTRUCTOR(ts_write,base_type)
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