|
|
Boost-Commit : |
From: eric_at_[hidden]
Date: 2008-01-03 23:08:57
Author: eric_niebler
Date: 2008-01-03 23:08:53 EST (Thu, 03 Jan 2008)
New Revision: 42451
URL: http://svn.boost.org/trac/boost/changeset/42451
Log:
Merged revisions 42432-42450 via svnmerge from
https://svn.boost.org/svn/boost/trunk
........
r42433 | eric_niebler | 2008-01-02 22:11:00 -0800 (Wed, 02 Jan 2008) | 1 line
add missing #includes
........
r42435 | johnmaddock | 2008-01-03 02:04:01 -0800 (Thu, 03 Jan 2008) | 1 line
Add cstdio include to keep libstdcxx happy.
........
r42436 | schoepflin | 2008-01-03 02:04:39 -0800 (Thu, 03 Jan 2008) | 2 lines
Modified spelling of my surname to avoid problems with non-ASCII characters.
........
r42440 | turkanis | 2008-01-03 11:10:48 -0800 (Thu, 03 Jan 2008) | 1 line
changes from iostreams_dev not merged by svnmerge for some reason; better error reporting for file_offset_64bit_test.cpp; added 'std::' all over the place for Intel on Linux and Darwin; commented out stream_state_test.cpp because it seems to be a test for the standard library, and it is not clear that the standard requires that the test pass
........
r42441 | turkanis | 2008-01-03 11:28:01 -0800 (Thu, 03 Jan 2008) | 1 line
merged changes from iostreams_dev not handled by svnmerge for some reason; use BOOST_NO_RESULT_OF workaround even for late versions of Borland that supposedly have result_of; added 'std::' all over the place for Intel on Linux and Darwin
........
r42447 | andreas_huber69 | 2008-01-03 15:17:00 -0800 (Thu, 03 Jan 2008) | 2 lines
- Updated copyright years
- Factored out transition dispatching logic
........
r42448 | eric_niebler | 2008-01-03 16:10:53 -0800 (Thu, 03 Jan 2008) | 1 line
add missing typename keyword
........
r42449 | eric_niebler | 2008-01-03 16:41:44 -0800 (Thu, 03 Jan 2008) | 1 line
don't deref NULL in typeof, to keep HP cxx happy
........
Added:
branches/proto/v3/boost/statechart/detail/reaction_dispatcher.hpp
- copied unchanged from r42449, /trunk/boost/statechart/detail/reaction_dispatcher.hpp
Properties modified:
branches/proto/v3/ (props changed)
Text files modified:
branches/proto/v3/boost/accumulators/numeric/functional.hpp | 17 ++++++
branches/proto/v3/boost/accumulators/statistics/mean.hpp | 2
branches/proto/v3/boost/accumulators/statistics/pot_quantile.hpp | 6 +-
branches/proto/v3/boost/config/compiler/vacpp.hpp | 2
branches/proto/v3/boost/iostreams/code_converter.hpp | 22 ++++----
branches/proto/v3/boost/iostreams/copy.hpp | 16 +++---
branches/proto/v3/boost/iostreams/detail/adapter/direct_adapter.hpp | 8 +-
branches/proto/v3/boost/iostreams/detail/buffer.hpp | 10 ++--
branches/proto/v3/boost/iostreams/detail/execute.hpp | 5 +
branches/proto/v3/boost/iostreams/detail/streambuf/indirect_streambuf.hpp | 9 ++-
branches/proto/v3/boost/iostreams/filter/aggregate.hpp | 10 ++--
branches/proto/v3/boost/iostreams/filter/gzip.hpp | 12 ++--
branches/proto/v3/boost/iostreams/filter/line.hpp | 6 +-
branches/proto/v3/boost/iostreams/filter/symmetric.hpp | 13 ++--
branches/proto/v3/boost/iostreams/positioning.hpp | 10 ++-
branches/proto/v3/boost/iostreams/restrict.hpp | 13 ++--
branches/proto/v3/boost/spirit/core/primitives/primitives.hpp | 2
branches/proto/v3/boost/statechart/detail/rtti_policy.hpp | 2
branches/proto/v3/boost/statechart/detail/state_base.hpp | 2
branches/proto/v3/boost/statechart/event.hpp | 2
branches/proto/v3/boost/statechart/event_processor.hpp | 2
branches/proto/v3/boost/statechart/fifo_worker.hpp | 2
branches/proto/v3/boost/statechart/in_state_reaction.hpp | 4
branches/proto/v3/boost/statechart/processor_container.hpp | 2
branches/proto/v3/boost/statechart/simple_state.hpp | 2
branches/proto/v3/boost/statechart/state_machine.hpp | 2
branches/proto/v3/boost/statechart/transition.hpp | 97 +++++----------------------------------
branches/proto/v3/boost/test/impl/debug.ipp | 1
branches/proto/v3/boost/xpressive/match_results.hpp | 2
branches/proto/v3/boost/xpressive/traits/c_regex_traits.hpp | 1
branches/proto/v3/boost/xpressive/traits/cpp_regex_traits.hpp | 1
branches/proto/v3/libs/bind/test/bind_lookup_problem_test.cpp | 2
branches/proto/v3/libs/iostreams/doc/acknowledgments.html | 2
branches/proto/v3/libs/iostreams/example/container_device.hpp | 15 +++--
branches/proto/v3/libs/iostreams/example/dictionary_filter.hpp | 7 +-
branches/proto/v3/libs/iostreams/test/Jamfile.v2 | 2
branches/proto/v3/libs/iostreams/test/stream_offset_64bit_test.cpp | 13 ++++
branches/proto/v3/libs/serialization/doc/acknowledgments.html | 2
branches/proto/v3/libs/statechart/example/Performance/Performance.cpp | 2
branches/proto/v3/libs/statechart/example/PingPong/PingPong.cpp | 2
branches/proto/v3/libs/statechart/test/FifoSchedulerTest.cpp | 2
branches/proto/v3/libs/statechart/test/TuTest.cpp | 2
42 files changed, 149 insertions(+), 187 deletions(-)
Modified: branches/proto/v3/boost/accumulators/numeric/functional.hpp
==============================================================================
--- branches/proto/v3/boost/accumulators/numeric/functional.hpp (original)
+++ branches/proto/v3/boost/accumulators/numeric/functional.hpp 2008-01-03 23:08:53 EST (Thu, 03 Jan 2008)
@@ -71,6 +71,12 @@
{
typedef Left &type;
};
+
+ namespace detail
+ {
+ template<typename T>
+ T &lvalue_of();
+ }
}
// TODO: handle complex weight, valarray, MTL vectors
@@ -83,7 +89,10 @@
template<typename Arg> \
struct result_of_ ## Name \
{ \
- BOOST_TYPEOF_NESTED_TYPEDEF_TPL(nested, Op (*(Arg*)0)) \
+ BOOST_TYPEOF_NESTED_TYPEDEF_TPL( \
+ nested \
+ , Op boost::numeric::functional::detail::lvalue_of<Arg>() \
+ ) \
typedef typename nested::type type; \
}; \
template<typename Arg, typename EnableIf> \
@@ -154,7 +163,11 @@
/// INTERNAL ONLY
///
#define BOOST_NUMERIC_FUNCTIONAL_DEDUCED(Left, Op, Right) \
- BOOST_TYPEOF_NESTED_TYPEDEF_TPL(nested, (*(Left*)0) Op (*(Right*)0)) \
+ BOOST_TYPEOF_NESTED_TYPEDEF_TPL( \
+ nested \
+ , boost::numeric::functional::detail::lvalue_of<Left>() Op \
+ boost::numeric::functional::detail::lvalue_of<Right>() \
+ ) \
typedef typename nested::type type; \
/**/
Modified: branches/proto/v3/boost/accumulators/statistics/mean.hpp
==============================================================================
--- branches/proto/v3/boost/accumulators/statistics/mean.hpp (original)
+++ branches/proto/v3/boost/accumulators/statistics/mean.hpp 2008-01-03 23:08:53 EST (Thu, 03 Jan 2008)
@@ -144,7 +144,7 @@
{
extractor<tag::mean> const mean = {};
extractor<tag::mean_of_weights> const mean_of_weights = {};
- BOOST_ACCUMULATORS_DEFINE_EXTRACTOR(tag, mean_of_variates, (typename)(typename));
+ BOOST_ACCUMULATORS_DEFINE_EXTRACTOR(tag, mean_of_variates, (typename)(typename))
}
using extract::mean;
Modified: branches/proto/v3/boost/accumulators/statistics/pot_quantile.hpp
==============================================================================
--- branches/proto/v3/boost/accumulators/statistics/pot_quantile.hpp (original)
+++ branches/proto/v3/boost/accumulators/statistics/pot_quantile.hpp 2008-01-03 23:08:53 EST (Thu, 03 Jan 2008)
@@ -72,9 +72,9 @@
extractor<peaks_over_threshold_tag> const some_peaks_over_threshold = {};
- float_type u_bar = some_peaks_over_threshold(args).get<0>();
- float_type beta_bar = some_peaks_over_threshold(args).get<1>();
- float_type xi_hat = some_peaks_over_threshold(args).get<2>();
+ float_type u_bar = some_peaks_over_threshold(args).template get<0>();
+ float_type beta_bar = some_peaks_over_threshold(args).template get<1>();
+ float_type xi_hat = some_peaks_over_threshold(args).template get<2>();
return this->sign_*(u_bar + beta_bar/xi_hat * ( std::pow(
is_same<LeftRight, left>::value ? args[quantile_probability] : 1. - args[quantile_probability]
Modified: branches/proto/v3/boost/config/compiler/vacpp.hpp
==============================================================================
--- branches/proto/v3/boost/config/compiler/vacpp.hpp (original)
+++ branches/proto/v3/boost/config/compiler/vacpp.hpp 2008-01-03 23:08:53 EST (Thu, 03 Jan 2008)
@@ -1,7 +1,7 @@
// (C) Copyright John Maddock 2001 - 2003.
// (C) Copyright Toon Knapen 2001 - 2003.
// (C) Copyright Lie-Quan Lee 2001.
-// (C) Copyright Markus Schöpflin 2002 - 2003.
+// (C) Copyright Markus Schoepflin 2002 - 2003.
// (C) Copyright Beman Dawes 2002 - 2003.
// Use, modification and distribution are subject to the
// Boost Software License, Version 1.0. (See accompanying file
Modified: branches/proto/v3/boost/iostreams/code_converter.hpp
==============================================================================
--- branches/proto/v3/boost/iostreams/code_converter.hpp (original)
+++ branches/proto/v3/boost/iostreams/code_converter.hpp 2008-01-03 23:08:53 EST (Thu, 03 Jan 2008)
@@ -314,7 +314,7 @@
using namespace std;
const extern_type* next; // Next external char.
intern_type* nint; // Next internal char.
- streamsize total = 0; // Characters read.
+ std::streamsize total = 0; // Characters read.
int status = iostreams::char_traits<char>::good();
bool partial = false;
buffer_type& buf = in();
@@ -330,12 +330,12 @@
}
// Convert.
- codecvt_base::result result =
+ std::codecvt_base::result result =
cvt().in( buf.state(),
buf.ptr(), buf.eptr(), next,
s + total, s + n, nint );
buf.ptr() += next - buf.ptr();
- total = static_cast<streamsize>(nint - s);
+ total = static_cast<std::streamsize>(nint - s);
switch (result) {
case codecvt_base::partial:
@@ -345,8 +345,8 @@
break;
case codecvt_base::noconv:
{
- streamsize amt =
- std::min<streamsize>(next - buf.ptr(), n - total);
+ std::streamsize amt =
+ std::min<std::streamsize>(next - buf.ptr(), n - total);
detail::strncpy_if_same(s + total, buf.ptr(), amt);
total += amt;
}
@@ -370,7 +370,7 @@
buffer_type& buf = out();
extern_type* next; // Next external char.
const intern_type* nint; // Next internal char.
- streamsize total = 0; // Characters written.
+ std::streamsize total = 0; // Characters written.
bool partial = false;
while (total < n) {
@@ -383,7 +383,7 @@
}
// Convert.
- codecvt_base::result result =
+ std::codecvt_base::result result =
cvt().out( buf.state(),
s + total, s + n, nint,
buf.eptr(), buf.end(), next );
@@ -394,13 +394,13 @@
case codecvt_base::partial:
partial = true; // Fall through.
case codecvt_base::ok:
- total = static_cast<streamsize>(nint - s);
+ total = static_cast<std::streamsize>(nint - s);
break;
case codecvt_base::noconv:
{
- streamsize amt =
- std::min<streamsize>( nint - total - s,
- buf.end() - buf.eptr() );
+ std::streamsize amt =
+ std::min<std::streamsize>( nint - total - s,
+ buf.end() - buf.eptr() );
detail::strncpy_if_same(buf.eptr(), s + total, amt);
total += amt;
}
Modified: branches/proto/v3/boost/iostreams/copy.hpp
==============================================================================
--- branches/proto/v3/boost/iostreams/copy.hpp (original)
+++ branches/proto/v3/boost/iostreams/copy.hpp 2008-01-03 23:08:53 EST (Thu, 03 Jan 2008)
@@ -56,11 +56,11 @@
{
using namespace std;
typedef typename char_type_of<Source>::type char_type;
- typedef pair<char_type*, char_type*> pair_type;
+ typedef std::pair<char_type*, char_type*> pair_type;
pair_type p1 = iostreams::input_sequence(src);
pair_type p2 = iostreams::output_sequence(snk);
- streamsize total =
- static_cast<streamsize>(
+ std::streamsize total =
+ static_cast<std::streamsize>(
(std::min)(p1.second - p1.first, p2.second - p2.first)
);
std::copy(p1.first, p1.first + total, p2.first);
@@ -75,10 +75,10 @@
{
using namespace std;
typedef typename char_type_of<Source>::type char_type;
- typedef pair<char_type*, char_type*> pair_type;
+ typedef std::pair<char_type*, char_type*> pair_type;
pair_type p = iostreams::input_sequence(src);
std::streamsize size, total;
- for ( total = 0, size = static_cast<streamsize>(p.second - p.first);
+ for ( total = 0, size = static_cast<std::streamsize>(p.second - p.first);
total < size; )
{
std::streamsize amt =
@@ -96,13 +96,13 @@
{
using namespace std;
typedef typename char_type_of<Source>::type char_type;
- typedef pair<char_type*, char_type*> pair_type;
+ typedef std::pair<char_type*, char_type*> pair_type;
detail::basic_buffer<char_type> buf(buffer_size);
pair_type p = snk.output_sequence();
- streamsize total = 0;
+ std::streamsize total = 0;
ptrdiff_t capacity = p.second - p.first;
while (true) {
- streamsize amt =
+ std::streamsize amt =
iostreams::read(
src,
buf.data(),
Modified: branches/proto/v3/boost/iostreams/detail/adapter/direct_adapter.hpp
==============================================================================
--- branches/proto/v3/boost/iostreams/detail/adapter/direct_adapter.hpp (original)
+++ branches/proto/v3/boost/iostreams/detail/adapter/direct_adapter.hpp 2008-01-03 23:08:53 EST (Thu, 03 Jan 2008)
@@ -193,9 +193,9 @@
{
using namespace std;
pointers& get = ptrs_.first();
- streamsize avail =
- static_cast<streamsize>(get.end - get.ptr);
- streamsize result = (std::min)(n, avail);
+ std::streamsize avail =
+ static_cast<std::streamsize>(get.end - get.ptr);
+ std::streamsize result = (std::min)(n, avail);
std::copy(get.ptr, get.ptr + result, s);
get.ptr += result;
return result != 0 ? result : -1;
@@ -207,7 +207,7 @@
{
using namespace std;
pointers& put = ptrs_.second();
- if (n > static_cast<streamsize>(put.end - put.ptr))
+ if (n > static_cast<std::streamsize>(put.end - put.ptr))
throw write_area_exhausted();
std::copy(s, s + n, put.ptr);
put.ptr += n;
Modified: branches/proto/v3/boost/iostreams/detail/buffer.hpp
==============================================================================
--- branches/proto/v3/boost/iostreams/detail/buffer.hpp (original)
+++ branches/proto/v3/boost/iostreams/detail/buffer.hpp 2008-01-03 23:08:53 EST (Thu, 03 Jan 2008)
@@ -95,11 +95,11 @@
typename int_type_of<Source>::type fill(Source& src)
{
using namespace std;
- streamsize keep;
- if ((keep = static_cast<streamsize>(eptr_ - ptr_)) > 0)
+ std::streamsize keep;
+ if ((keep = static_cast<std::streamsize>(eptr_ - ptr_)) > 0)
traits_type::move(this->data(), ptr_, keep);
set(0, keep);
- streamsize result =
+ std::streamsize result =
iostreams::read(src, this->data() + keep, this->size() - keep);
if (result != -1)
this->set(0, keep + result);
@@ -121,8 +121,8 @@
bool flush(Sink& dest)
{
using namespace std;
- streamsize amt = static_cast<std::streamsize>(eptr_ - ptr_);
- streamsize result = iostreams::write_if(dest, ptr_, amt);
+ std::streamsize amt = static_cast<std::streamsize>(eptr_ - ptr_);
+ std::streamsize result = iostreams::write_if(dest, ptr_, amt);
if (result < amt) {
traits_type::move( this->data(),
ptr_ + result,
Modified: branches/proto/v3/boost/iostreams/detail/execute.hpp
==============================================================================
--- branches/proto/v3/boost/iostreams/detail/execute.hpp (original)
+++ branches/proto/v3/boost/iostreams/detail/execute.hpp 2008-01-03 23:08:53 EST (Thu, 03 Jan 2008)
@@ -70,11 +70,12 @@
// returning void and non-void.
template< typename Op,
typename Result = // VC6.5 workaround.
- #ifndef BOOST_NO_RESULT_OF
+ #if !defined(BOOST_NO_RESULT_OF) && \
+ !BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x592))
typename boost::result_of<Op()>::type
#else
BOOST_DEDUCED_TYPENAME Op::result_type
- #endif
+ #endif
>
struct execute_traits
: execute_traits_impl<Result>
Modified: branches/proto/v3/boost/iostreams/detail/streambuf/indirect_streambuf.hpp
==============================================================================
--- branches/proto/v3/boost/iostreams/detail/streambuf/indirect_streambuf.hpp (original)
+++ branches/proto/v3/boost/iostreams/detail/streambuf/indirect_streambuf.hpp 2008-01-03 23:08:53 EST (Thu, 03 Jan 2008)
@@ -167,7 +167,7 @@
// Construct input buffer.
if (can_read()) {
pback_size_ = (std::max)(2, pback_size); // STLPort needs 2.
- streamsize size =
+ std::streamsize size =
pback_size_ +
( buffer_size ? buffer_size: 1 );
in().resize(size);
@@ -238,8 +238,9 @@
if (gptr() < egptr()) return traits_type::to_int_type(*gptr());
// Fill putback buffer.
- streamsize keep = (std::min)( static_cast<streamsize>(gptr() - eback()),
- pback_size_ );
+ std::streamsize keep =
+ (std::min)( static_cast<std::streamsize>(gptr() - eback()),
+ pback_size_ );
if (keep)
traits_type::move( buf.data() + (pback_size_ - keep),
gptr() - keep, keep );
@@ -250,7 +251,7 @@
buf.data() + pback_size_ );
// Read from source.
- streamsize chars =
+ std::streamsize chars =
obj().read(buf.data() + pback_size_, buf.size() - pback_size_, next_);
if (chars == -1) {
this->set_true_eof(true);
Modified: branches/proto/v3/boost/iostreams/filter/aggregate.hpp
==============================================================================
--- branches/proto/v3/boost/iostreams/filter/aggregate.hpp (original)
+++ branches/proto/v3/boost/iostreams/filter/aggregate.hpp 2008-01-03 23:08:53 EST (Thu, 03 Jan 2008)
@@ -58,8 +58,8 @@
state_ |= f_read;
if (!(state_ & f_eof))
do_read(src);
- streamsize amt =
- (std::min)(n, static_cast<streamsize>(data_.size() - ptr_));
+ std::streamsize amt =
+ (std::min)(n, static_cast<std::streamsize>(data_.size() - ptr_));
if (amt) {
BOOST_IOSTREAMS_CHAR_TRAITS(char_type)::copy(s, &data_[ptr_], amt);
ptr_ += amt;
@@ -110,9 +110,9 @@
using std::streamsize;
vector_type data;
while (true) {
- const streamsize size = default_device_buffer_size;
- Ch buf[size];
- streamsize amt;
+ const std::streamsize size = default_device_buffer_size;
+ Ch buf[size];
+ std::streamsize amt;
if ((amt = boost::iostreams::read(src, buf, size)) == -1)
break;
data.insert(data.end(), buf, buf + amt);
Modified: branches/proto/v3/boost/iostreams/filter/gzip.hpp
==============================================================================
--- branches/proto/v3/boost/iostreams/filter/gzip.hpp (original)
+++ branches/proto/v3/boost/iostreams/filter/gzip.hpp 2008-01-03 23:08:53 EST (Thu, 03 Jan 2008)
@@ -185,8 +185,7 @@
template<typename Source>
std::streamsize read(Source& src, char_type* s, std::streamsize n)
{
- using namespace std;
- streamsize result = 0;
+ std::streamsize result = 0;
// Read header.
if (!(flags_ & f_header_done))
@@ -196,7 +195,7 @@
if (!(flags_ & f_body_done)) {
// Read from basic_zlib_filter.
- streamsize amt = base_type::read(src, s + result, n - result);
+ std::streamsize amt = base_type::read(src, s + result, n - result);
if (amt != -1) {
result += amt;
if (amt < n - result) { // Double-check for EOF.
@@ -557,10 +556,9 @@
std::streamsize basic_gzip_compressor<Alloc>::read_string
(char* s, std::streamsize n, std::string& str)
{
- using namespace std;
- streamsize avail =
- static_cast<streamsize>(str.size() - offset_);
- streamsize amt = (std::min)(avail, n);
+ std::streamsize avail =
+ static_cast<std::streamsize>(str.size() - offset_);
+ std::streamsize amt = (std::min)(avail, n);
std::copy( str.data() + offset_,
str.data() + offset_ + amt,
s );
Modified: branches/proto/v3/boost/iostreams/filter/line.hpp
==============================================================================
--- branches/proto/v3/boost/iostreams/filter/line.hpp (original)
+++ branches/proto/v3/boost/iostreams/filter/line.hpp 2008-01-03 23:08:53 EST (Thu, 03 Jan 2008)
@@ -70,7 +70,7 @@
state_ |= f_read;
// Handle unfinished business.
- streamsize result = 0;
+ std::streamsize result = 0;
if (!cur_line_.empty() && (result = read_line(s, n)) == n)
return n;
@@ -143,8 +143,8 @@
std::streamsize read_line(char_type* s, std::streamsize n)
{
using namespace std;
- streamsize result =
- (std::min) (n, static_cast<streamsize>(cur_line_.size()));
+ std::streamsize result =
+ (std::min) (n, static_cast<std::streamsize>(cur_line_.size()));
traits_type::copy(s, cur_line_.data(), result);
cur_line_.erase(0, result);
return result;
Modified: branches/proto/v3/boost/iostreams/filter/symmetric.hpp
==============================================================================
--- branches/proto/v3/boost/iostreams/filter/symmetric.hpp (original)
+++ branches/proto/v3/boost/iostreams/filter/symmetric.hpp 2008-01-03 23:08:53 EST (Thu, 03 Jan 2008)
@@ -115,7 +115,9 @@
!filter().filter(next, buf.eptr(), next_s, end_s, flush);
buf.ptr() = buf.data() + (next - buf.data());
if (done)
- return detail::check_eof(static_cast<streamsize>(next_s - s));
+ return detail::check_eof(
+ static_cast<std::streamsize>(next_s - s)
+ );
}
// If no more characters are available without blocking, or
@@ -123,7 +125,7 @@
if ( status == f_would_block && buf.ptr() == buf.eptr() ||
next_s == end_s )
{
- return static_cast<streamsize>(next_s - s);
+ return static_cast<std::streamsize>(next_s - s);
}
// Fill buffer.
@@ -215,11 +217,10 @@
template<typename Sink>
bool flush(Sink& snk, mpl::true_)
{
- using std::streamsize;
typedef char_traits<char_type> traits_type;
- streamsize amt =
- static_cast<streamsize>(buf().ptr() - buf().data());
- streamsize result =
+ std::streamsize amt =
+ static_cast<std::streamsize>(buf().ptr() - buf().data());
+ std::streamsize result =
boost::iostreams::write(snk, buf().data(), amt);
if (result < amt && result > 0)
traits_type::move(buf().data(), buf().data() + result, amt - result);
Modified: branches/proto/v3/boost/iostreams/positioning.hpp
==============================================================================
--- branches/proto/v3/boost/iostreams/positioning.hpp (original)
+++ branches/proto/v3/boost/iostreams/positioning.hpp 2008-01-03 23:08:53 EST (Thu, 03 Jan 2008)
@@ -68,8 +68,8 @@
{
// Use implementation-specific member function seekpos().
return fpos_t_to_offset(pos.seekpos()) +
- stream_offset(std::streamoff(pos)) -
- stream_offset(std::streamoff(pos.seekpos()));
+ static_cast<stream_offset>(static_cast<std::streamoff>(pos)) -
+ static_cast<stream_offset>(_FPOSOFF(pos.seekpos()));
}
# else // # if defined(_CPPLIB_VER) //----------------------------------------//
@@ -80,8 +80,10 @@
{
// use implementation-specific member function get_fpos_t().
return fpos_t_to_offset(pos.get_fpos_t()) +
- stream_offset(std::streamoff(pos)) -
- stream_offset(std::streamoff(pos.get_fpos_t()));
+ static_cast<stream_offset>(static_cast<std::streamoff>(pos)) -
+ static_cast<stream_offset>(
+ static_cast<std::streamoff>(pos.get_fpos_t())
+ );
}
# endif // # if defined(_CPPLIB_VER) //---------------------------------------//
Modified: branches/proto/v3/boost/iostreams/restrict.hpp
==============================================================================
--- branches/proto/v3/boost/iostreams/restrict.hpp (original)
+++ branches/proto/v3/boost/iostreams/restrict.hpp 2008-01-03 23:08:53 EST (Thu, 03 Jan 2008)
@@ -128,11 +128,12 @@
using namespace std;
if (!open_)
open(src, BOOST_IOS::in);
- streamsize amt =
+ std::streamsize amt =
end_ != -1 ?
- (std::min) (n, static_cast<streamsize>(end_ - pos_)) :
+ (std::min) (n, static_cast<std::streamsize>(end_ - pos_)) :
n;
- streamsize result = iostreams::read(this->component(), src, s, amt);
+ std::streamsize result =
+ iostreams::read(this->component(), src, s, amt);
if (result != -1)
pos_ += result;
return result;
@@ -331,11 +332,11 @@
(char_type* s, std::streamsize n)
{
using namespace std;
- streamsize amt =
+ std::streamsize amt =
end_ != -1 ?
- (std::min) (n, static_cast<streamsize>(end_ - pos_)) :
+ (std::min) (n, static_cast<std::streamsize>(end_ - pos_)) :
n;
- streamsize result = iostreams::read(this->component(), s, amt);
+ std::streamsize result = iostreams::read(this->component(), s, amt);
if (result != -1)
pos_ += result;
return result;
Modified: branches/proto/v3/boost/spirit/core/primitives/primitives.hpp
==============================================================================
--- branches/proto/v3/boost/spirit/core/primitives/primitives.hpp (original)
+++ branches/proto/v3/boost/spirit/core/primitives/primitives.hpp 2008-01-03 23:08:53 EST (Thu, 03 Jan 2008)
@@ -609,7 +609,7 @@
///////////////////////////////////////////////////////////////////////////
//
- // end_parser class (suggested by Markus Schöpflin)
+ // end_parser class (suggested by Markus Schoepflin)
//
///////////////////////////////////////////////////////////////////////////
struct end_parser : public parser<end_parser>
Modified: branches/proto/v3/boost/statechart/detail/rtti_policy.hpp
==============================================================================
--- branches/proto/v3/boost/statechart/detail/rtti_policy.hpp (original)
+++ branches/proto/v3/boost/statechart/detail/rtti_policy.hpp 2008-01-03 23:08:53 EST (Thu, 03 Jan 2008)
@@ -1,7 +1,7 @@
#ifndef BOOST_STATECHART_DETAIL_RTTI_POLICY_HPP_INCLUDED
#define BOOST_STATECHART_DETAIL_RTTI_POLICY_HPP_INCLUDED
//////////////////////////////////////////////////////////////////////////////
-// Copyright 2002-2006 Andreas Huber Doenni
+// Copyright 2002-2008 Andreas Huber Doenni
// Distributed under the Boost Software License, Version 1.0. (See accompany-
// ing file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
//////////////////////////////////////////////////////////////////////////////
Modified: branches/proto/v3/boost/statechart/detail/state_base.hpp
==============================================================================
--- branches/proto/v3/boost/statechart/detail/state_base.hpp (original)
+++ branches/proto/v3/boost/statechart/detail/state_base.hpp 2008-01-03 23:08:53 EST (Thu, 03 Jan 2008)
@@ -1,7 +1,7 @@
#ifndef BOOST_STATECHART_DETAIL_STATE_BASE_HPP_INCLUDED
#define BOOST_STATECHART_DETAIL_STATE_BASE_HPP_INCLUDED
//////////////////////////////////////////////////////////////////////////////
-// Copyright 2002-2006 Andreas Huber Doenni
+// Copyright 2002-2008 Andreas Huber Doenni
// Distributed under the Boost Software License, Version 1.0. (See accompany-
// ing file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
//////////////////////////////////////////////////////////////////////////////
Modified: branches/proto/v3/boost/statechart/event.hpp
==============================================================================
--- branches/proto/v3/boost/statechart/event.hpp (original)
+++ branches/proto/v3/boost/statechart/event.hpp 2008-01-03 23:08:53 EST (Thu, 03 Jan 2008)
@@ -1,7 +1,7 @@
#ifndef BOOST_STATECHART_EVENT_HPP_INCLUDED
#define BOOST_STATECHART_EVENT_HPP_INCLUDED
//////////////////////////////////////////////////////////////////////////////
-// Copyright 2002-2006 Andreas Huber Doenni
+// Copyright 2002-2007 Andreas Huber Doenni
// Distributed under the Boost Software License, Version 1.0. (See accompany-
// ing file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
//////////////////////////////////////////////////////////////////////////////
Modified: branches/proto/v3/boost/statechart/event_processor.hpp
==============================================================================
--- branches/proto/v3/boost/statechart/event_processor.hpp (original)
+++ branches/proto/v3/boost/statechart/event_processor.hpp 2008-01-03 23:08:53 EST (Thu, 03 Jan 2008)
@@ -1,7 +1,7 @@
#ifndef BOOST_STATECHART_EVENT_PROCESSOR_INCLUDED
#define BOOST_STATECHART_EVENT_PROCESSOR_INCLUDED
//////////////////////////////////////////////////////////////////////////////
-// Copyright 2002-2006 Andreas Huber Doenni
+// Copyright 2002-2008 Andreas Huber Doenni
// Distributed under the Boost Software License, Version 1.0. (See accompany-
// ing file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
//////////////////////////////////////////////////////////////////////////////
Modified: branches/proto/v3/boost/statechart/fifo_worker.hpp
==============================================================================
--- branches/proto/v3/boost/statechart/fifo_worker.hpp (original)
+++ branches/proto/v3/boost/statechart/fifo_worker.hpp 2008-01-03 23:08:53 EST (Thu, 03 Jan 2008)
@@ -1,7 +1,7 @@
#ifndef BOOST_STATECHART_FIFO_WORKER_HPP_INCLUDED
#define BOOST_STATECHART_FIFO_WORKER_HPP_INCLUDED
//////////////////////////////////////////////////////////////////////////////
-// Copyright 2002-2007 Andreas Huber Doenni
+// Copyright 2002-2008 Andreas Huber Doenni
// Distributed under the Boost Software License, Version 1.0. (See accompany-
// ing file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
//////////////////////////////////////////////////////////////////////////////
Modified: branches/proto/v3/boost/statechart/in_state_reaction.hpp
==============================================================================
--- branches/proto/v3/boost/statechart/in_state_reaction.hpp (original)
+++ branches/proto/v3/boost/statechart/in_state_reaction.hpp 2008-01-03 23:08:53 EST (Thu, 03 Jan 2008)
@@ -1,7 +1,7 @@
#ifndef BOOST_STATECHART_IN_STATE_REACTION_HPP_INCLUDED
#define BOOST_STATECHART_IN_STATE_REACTION_HPP_INCLUDED
//////////////////////////////////////////////////////////////////////////////
-// Copyright 2005-2006 Andreas Huber Doenni
+// Copyright 2005-2008 Andreas Huber Doenni
// Distributed under the Boost Software License, Version 1.0. (See accompany-
// ing file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
//////////////////////////////////////////////////////////////////////////////
@@ -27,7 +27,7 @@
class event_base;
//////////////////////////////////////////////////////////////////////////////
-template< class Event,
+template< class Event,
class ReactionContext,
void ( ReactionContext::*pAction )( const Event & ) >
class in_state_reaction
Modified: branches/proto/v3/boost/statechart/processor_container.hpp
==============================================================================
--- branches/proto/v3/boost/statechart/processor_container.hpp (original)
+++ branches/proto/v3/boost/statechart/processor_container.hpp 2008-01-03 23:08:53 EST (Thu, 03 Jan 2008)
@@ -1,7 +1,7 @@
#ifndef BOOST_STATECHART_PROCESSOR_CONTAINER_HPP_INCLUDED
#define BOOST_STATECHART_PROCESSOR_CONTAINER_HPP_INCLUDED
//////////////////////////////////////////////////////////////////////////////
-// Copyright 2002-2006 Andreas Huber Doenni
+// Copyright 2002-2008 Andreas Huber Doenni
// Distributed under the Boost Software License, Version 1.0. (See accompany-
// ing file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
//////////////////////////////////////////////////////////////////////////////
Modified: branches/proto/v3/boost/statechart/simple_state.hpp
==============================================================================
--- branches/proto/v3/boost/statechart/simple_state.hpp (original)
+++ branches/proto/v3/boost/statechart/simple_state.hpp 2008-01-03 23:08:53 EST (Thu, 03 Jan 2008)
@@ -1,7 +1,7 @@
#ifndef BOOST_STATECHART_SIMPLE_STATE_HPP_INCLUDED
#define BOOST_STATECHART_SIMPLE_STATE_HPP_INCLUDED
//////////////////////////////////////////////////////////////////////////////
-// Copyright 2002-2006 Andreas Huber Doenni
+// Copyright 2002-2008 Andreas Huber Doenni
// Distributed under the Boost Software License, Version 1.0. (See accompany-
// ing file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
//////////////////////////////////////////////////////////////////////////////
Modified: branches/proto/v3/boost/statechart/state_machine.hpp
==============================================================================
--- branches/proto/v3/boost/statechart/state_machine.hpp (original)
+++ branches/proto/v3/boost/statechart/state_machine.hpp 2008-01-03 23:08:53 EST (Thu, 03 Jan 2008)
@@ -1,7 +1,7 @@
#ifndef BOOST_STATECHART_STATE_MACHINE_HPP_INCLUDED
#define BOOST_STATECHART_STATE_MACHINE_HPP_INCLUDED
//////////////////////////////////////////////////////////////////////////////
-// Copyright 2002-2006 Andreas Huber Doenni
+// Copyright 2002-2008 Andreas Huber Doenni
// Distributed under the Boost Software License, Version 1.0. (See accompany-
// ing file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
//////////////////////////////////////////////////////////////////////////////
Modified: branches/proto/v3/boost/statechart/transition.hpp
==============================================================================
--- branches/proto/v3/boost/statechart/transition.hpp (original)
+++ branches/proto/v3/boost/statechart/transition.hpp 2008-01-03 23:08:53 EST (Thu, 03 Jan 2008)
@@ -1,7 +1,7 @@
#ifndef BOOST_STATECHART_TRANSITION_HPP_INCLUDED
#define BOOST_STATECHART_TRANSITION_HPP_INCLUDED
//////////////////////////////////////////////////////////////////////////////
-// Copyright 2002-2006 Andreas Huber Doenni
+// Copyright 2002-2008 Andreas Huber Doenni
// Distributed under the Boost Software License, Version 1.0. (See accompany-
// ing file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
//////////////////////////////////////////////////////////////////////////////
@@ -10,10 +10,7 @@
#include <boost/statechart/result.hpp>
-#include <boost/mpl/if.hpp>
-
-#include <boost/cast.hpp> // boost::polymorphic_downcast
-#include <boost/type_traits/is_same.hpp>
+#include <boost/statechart/detail/reaction_dispatcher.hpp>
@@ -21,27 +18,10 @@
{
namespace statechart
{
-namespace detail
-{
//////////////////////////////////////////////////////////////////////////////
-template< class Event >
-struct no_context
-{
- void no_function( const Event & );
-};
-
-
-
-} // namespace detail
-
-
-
-class event_base;
-
-//////////////////////////////////////////////////////////////////////////////
template< class Event, class Destination,
class TransitionContext = detail::no_context< Event >,
void ( TransitionContext::*pTransitionAction )( const Event & ) =
@@ -50,67 +30,20 @@
{
private:
//////////////////////////////////////////////////////////////////////////
- struct react_without_transition_action_impl
+ template<
+ class State, class ActionContext,
+ void ( ActionContext::*pAction )( const Event & ), class Destination >
+ struct reactions
{
- template< class State, class EventBase >
- static result react( State & stt, const EventBase & )
+ static result react_without_action( State & stt )
{
return stt.template transit< Destination >();
}
- };
-
- struct react_base_with_transition_action_impl
- {
- template< class State, class EventBase >
- static result react( State & stt, const EventBase & evt )
- {
- return stt.template transit< Destination >( pTransitionAction, evt );
- }
- };
- struct react_base
- {
- template< class State, class EventBase, class IdType >
- static result react( State & stt, const EventBase & evt, const IdType & )
+ template< class Event >
+ static result react_with_action( State & stt, const Event & evt )
{
- typedef typename mpl::if_<
- is_same< TransitionContext, detail::no_context< Event > >,
- react_without_transition_action_impl,
- react_base_with_transition_action_impl
- >::type impl;
- return impl::react( stt, evt );
- }
- };
-
- struct react_derived_with_transition_action_impl
- {
- template< class State, class EventBase >
- static result react( State & stt, const EventBase & evt )
- {
- return stt.template transit< Destination >(
- pTransitionAction, *polymorphic_downcast< const Event * >( &evt ) );
- }
- };
-
- struct react_derived
- {
- template< class State, class EventBase, class IdType >
- static result react(
- State & stt, const EventBase & evt, const IdType & eventType )
- {
- if ( eventType == Event::static_type() )
- {
- typedef typename mpl::if_<
- is_same< TransitionContext, detail::no_context< Event > >,
- react_without_transition_action_impl,
- react_derived_with_transition_action_impl
- >::type impl;
- return impl::react( stt, evt );
- }
- else
- {
- return detail::result_utility::make_result( detail::no_reaction );
- }
+ return stt.template transit< Destination >( pAction, evt );
}
};
@@ -123,12 +56,10 @@
static detail::reaction_result react(
State & stt, const EventBase & evt, const IdType & eventType )
{
- typedef typename mpl::if_<
- is_same< Event, event_base >, react_base, react_derived
- >::type impl;
-
- return detail::result_utility::get_result(
- impl::react( stt, evt, eventType ) );
+ typedef detail::reaction_dispatcher<
+ reactions< State, TransitionContext, pTransitionAction, Destination >,
+ State, EventBase, Event, TransitionContext, IdType > dispatcher;
+ return dispatcher::react( stt, evt, eventType );
}
};
Modified: branches/proto/v3/boost/test/impl/debug.ipp
==============================================================================
--- branches/proto/v3/boost/test/impl/debug.ipp (original)
+++ branches/proto/v3/boost/test/impl/debug.ipp 2008-01-03 23:08:53 EST (Thu, 03 Jan 2008)
@@ -58,6 +58,7 @@
// STL
#include <cstring>
#include <map>
+#include <cstdio>
#include <stdarg.h> // !! ?? cstdarg
#include <memory.h>
Modified: branches/proto/v3/boost/xpressive/match_results.hpp
==============================================================================
--- branches/proto/v3/boost/xpressive/match_results.hpp (original)
+++ branches/proto/v3/boost/xpressive/match_results.hpp 2008-01-03 23:08:53 EST (Thu, 03 Jan 2008)
@@ -8,7 +8,7 @@
// Software License, Version 1.0. (See accompanying file
// LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
//
-// Acknowledgements: Thanks to Markus Sch\:opflin for helping to track down
+// Acknowledgements: Thanks to Markus Schoepflin for helping to track down
// a tricky formatting bug on HP Tru64, and to Steven Watanabe for suggesting
// the fix.
Modified: branches/proto/v3/boost/xpressive/traits/c_regex_traits.hpp
==============================================================================
--- branches/proto/v3/boost/xpressive/traits/c_regex_traits.hpp (original)
+++ branches/proto/v3/boost/xpressive/traits/c_regex_traits.hpp 2008-01-03 23:08:53 EST (Thu, 03 Jan 2008)
@@ -16,6 +16,7 @@
# pragma once
#endif
+#include <cstdlib>
#include <boost/config.hpp>
#include <boost/assert.hpp>
#include <boost/xpressive/traits/detail/c_ctype.hpp>
Modified: branches/proto/v3/boost/xpressive/traits/cpp_regex_traits.hpp
==============================================================================
--- branches/proto/v3/boost/xpressive/traits/cpp_regex_traits.hpp (original)
+++ branches/proto/v3/boost/xpressive/traits/cpp_regex_traits.hpp 2008-01-03 23:08:53 EST (Thu, 03 Jan 2008)
@@ -16,6 +16,7 @@
# pragma once
#endif
+#include <ios>
#include <string>
#include <locale>
#include <sstream>
Modified: branches/proto/v3/libs/bind/test/bind_lookup_problem_test.cpp
==============================================================================
--- branches/proto/v3/libs/bind/test/bind_lookup_problem_test.cpp (original)
+++ branches/proto/v3/libs/bind/test/bind_lookup_problem_test.cpp 2008-01-03 23:08:53 EST (Thu, 03 Jan 2008)
@@ -1,7 +1,7 @@
//
// bind_lookup_problem_test.cpp
//
-// Copyright (C) Markus Schöpflin 2005.
+// Copyright (C) Markus Schoepflin 2005.
//
// Use, modification, and distribution are subject to the Boost Software
// License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
Modified: branches/proto/v3/libs/iostreams/doc/acknowledgments.html
==============================================================================
--- branches/proto/v3/libs/iostreams/doc/acknowledgments.html (original)
+++ branches/proto/v3/libs/iostreams/doc/acknowledgments.html 2008-01-03 23:08:53 EST (Thu, 03 Jan 2008)
@@ -68,7 +68,7 @@
Jeff Garland served as review manager and provided helpful criticism and guidance.
</LI>
<LI CLASS="square">
- Those who participated in the formal review or the post-review discussions, or who submitted bug reports or patches, include (in no particular order) Adam Peterson, Joaquín M López Muñoz, Neal D. Becker, Stas Garifulin, Vladimir Prus, Rob Stewart, Robert Ramey, Michel Decima, Michiel Salters, Pedro Lamarão, Dietmar Kühl, Oleg Rekutin, Reece Dunn, Stefan Slapeta, Jeff Flinn, Jeff Garland, Eugene Lazutkin, John Torjo, Brian Braatz, Keith Burton, Keith MacDonald, Phil Richards, Arjen Wagenaar, Caleb Epstein, Dylan Trotter, Ben Hutchings, Daniel James, Daniel Schlyder, Jan Christiaan van Winkel, Jonathan Graehl, Jonathan Wakely, Rene Rivera, Tony Juricic, Bronek Kozicki, George M. Garner, Jr., Thorsten Ottosen, Bertolt Mildner, Carlo Wood, Christoper Diggins, Christoph Ludwig, Daryle Walker, Dirk Griffioen, Gareth Sylvester-Bradley, Jürgen Hunold, Larry Evans, Markus Schöpflin, Martin Ecker, Martin Wille, Russel Hind, Matthew Vogt, Matthias Troyer, Peter Dimov, Bruno Martínez Aguerre, Douglas Gregor, Pa
ul A. Bristow, David B. Held, Kevin Wheatley, Pavel Vozenilek, Emmanuel Thomé, Scott Woods, Israel Fernández Cabrera, Felix Gartsman, Pavel Chikulaev, Lisa Glendenning, Yuval Ronen and Paul Harris.
+ Those who participated in the formal review or the post-review discussions, or who submitted bug reports or patches, include (in no particular order) Adam Peterson, Joaquín M López Muñoz, Neal D. Becker, Stas Garifulin, Vladimir Prus, Rob Stewart, Robert Ramey, Michel Decima, Michiel Salters, Pedro Lamarão, Dietmar Kühl, Oleg Rekutin, Reece Dunn, Stefan Slapeta, Jeff Flinn, Jeff Garland, Eugene Lazutkin, John Torjo, Brian Braatz, Keith Burton, Keith MacDonald, Phil Richards, Arjen Wagenaar, Caleb Epstein, Dylan Trotter, Ben Hutchings, Daniel James, Daniel Schlyder, Jan Christiaan van Winkel, Jonathan Graehl, Jonathan Wakely, Rene Rivera, Tony Juricic, Bronek Kozicki, George M. Garner, Jr., Thorsten Ottosen, Bertolt Mildner, Carlo Wood, Christoper Diggins, Christoph Ludwig, Daryle Walker, Dirk Griffioen, Gareth Sylvester-Bradley, Jürgen Hunold, Larry Evans, Markus Schöpflin, Martin Ecker, Martin Wille, Russel Hind, Matthew Vogt, Matthias Troyer, Peter Dimov, Bruno Martínez Aguerre, Douglas Grego
r, Paul A. Bristow, David B. Held, Kevin Wheatley, Pavel Vozenilek, Emmanuel Thomé, Scott Woods, Israel Fernández Cabrera, Felix Gartsman, Pavel Chikulaev, Lisa Glendenning, Yuval Ronen and Paul Harris.
</LI>
</UL>
Modified: branches/proto/v3/libs/iostreams/example/container_device.hpp
==============================================================================
--- branches/proto/v3/libs/iostreams/example/container_device.hpp (original)
+++ branches/proto/v3/libs/iostreams/example/container_device.hpp 2008-01-03 23:08:53 EST (Thu, 03 Jan 2008)
@@ -30,8 +30,8 @@
std::streamsize read(char_type* s, std::streamsize n)
{
using namespace std;
- streamsize amt = static_cast<streamsize>(container_.size() - pos_);
- streamsize result = (min)(n, amt);
+ std::streamsize amt = static_cast<streamsize>(container_.size() - pos_);
+ std::streamsize result = (min)(n, amt);
if (result != 0) {
std::copy( container_.begin() + pos_,
container_.begin() + pos_ + result,
@@ -86,8 +86,9 @@
std::streamsize read(char_type* s, std::streamsize n)
{
using namespace std;
- streamsize amt = static_cast<streamsize>(container_.size() - pos_);
- streamsize result = (min)(n, amt);
+ std::streamsize amt =
+ static_cast<std::streamsize>(container_.size() - pos_);
+ std::streamsize result = (min)(n, amt);
if (result != 0) {
std::copy( container_.begin() + pos_,
container_.begin() + pos_ + result,
@@ -101,10 +102,10 @@
std::streamsize write(const char_type* s, std::streamsize n)
{
using namespace std;
- streamsize result = 0;
+ std::streamsize result = 0;
if (pos_ != container_.size()) {
- streamsize amt =
- static_cast<streamsize>(container_.size() - pos_);
+ std::streamsize amt =
+ static_cast<std::streamsize>(container_.size() - pos_);
result = (min)(n, amt);
std::copy(s, s + result, container_.begin() + pos_);
pos_ += result;
Modified: branches/proto/v3/libs/iostreams/example/dictionary_filter.hpp
==============================================================================
--- branches/proto/v3/libs/iostreams/example/dictionary_filter.hpp (original)
+++ branches/proto/v3/libs/iostreams/example/dictionary_filter.hpp 2008-01-03 23:08:53 EST (Thu, 03 Jan 2008)
@@ -51,7 +51,7 @@
if (c == EOF || !std::isalpha((unsigned char) c)) {
dictionary_.replace(current_word_);
cout.write( current_word_.data(),
- static_cast<streamsize>(current_word_.size()) );
+ static_cast<std::streamsize>(current_word_.size()) );
current_word_.erase();
if (c == EOF)
break;
@@ -167,8 +167,9 @@
bool write_current_word(Sink& dest)
{
using namespace std;
- streamsize amt = static_cast<streamsize>(current_word_.size() - off_);
- streamsize result =
+ std::streamsize amt =
+ static_cast<std::streamsize>(current_word_.size() - off_);
+ std::streamsize result =
iostreams::write(dest, current_word_.data() + off_, amt);
if (result == amt) {
current_word_.erase();
Modified: branches/proto/v3/libs/iostreams/test/Jamfile.v2
==============================================================================
--- branches/proto/v3/libs/iostreams/test/Jamfile.v2 (original)
+++ branches/proto/v3/libs/iostreams/test/Jamfile.v2 2008-01-03 23:08:53 EST (Thu, 03 Jan 2008)
@@ -72,7 +72,7 @@
[ test-iostreams stdio_filter_test.cpp ]
[ test-iostreams stream_offset_32bit_test.cpp ]
[ test-iostreams stream_offset_64bit_test.cpp ]
- [ test-iostreams stream_state_test.cpp ]
+ #[ test-iostreams stream_state_test.cpp ]
[ test-iostreams symmetric_filter_test.cpp ]
[ test-iostreams tee_test.cpp ]
[ test-iostreams wide_stream_test.cpp ]
Modified: branches/proto/v3/libs/iostreams/test/stream_offset_64bit_test.cpp
==============================================================================
--- branches/proto/v3/libs/iostreams/test/stream_offset_64bit_test.cpp (original)
+++ branches/proto/v3/libs/iostreams/test/stream_offset_64bit_test.cpp 2008-01-03 23:08:53 EST (Thu, 03 Jan 2008)
@@ -13,6 +13,7 @@
* with large (64-bit) file offsets.
*/
+#include <sstream>
#include <boost/config.hpp> // BOOST_MSVC
#include <boost/iostreams/positioning.hpp>
#include <boost/test/test_tools.hpp>
@@ -37,8 +38,16 @@
stream_offset last = large_file - large_file % 10000000;
for (stream_offset off = first; off < last; off += 10000000)
- {
- BOOST_REQUIRE(off == position_to_offset(offset_to_position(off)));
+ {
+ if (off != position_to_offset(offset_to_position(off))) {
+ stringstream s;
+ s << "off != position_to_offset(offset_to_position(off)) "
+ "failed for (off >> 32) == "
+ << static_cast<unsigned int>(off >> 32)
+ << " and (off & 0xFFFFFFFF) == "
+ << static_cast<unsigned int>(off & 0xFFFFFFFF);
+ BOOST_REQUIRE_MESSAGE(0, s.str().c_str());
+ }
}
}
Modified: branches/proto/v3/libs/serialization/doc/acknowledgments.html
==============================================================================
--- branches/proto/v3/libs/serialization/doc/acknowledgments.html (original)
+++ branches/proto/v3/libs/serialization/doc/acknowledgments.html 2008-01-03 23:08:53 EST (Thu, 03 Jan 2008)
@@ -33,7 +33,7 @@
<li>Mattias Troyer ehnanced the implementation of native binary archives. This includes
enhancement and generalization of the library itself including generalization of
the wrapper concept.
- <li>Markus Schöpflin tracked down issues with TRU64 compiler resulting in 100% passing.
+ <li>Markus Schöpflin tracked down issues with TRU64 compiler resulting in 100% passing.
<li><a href="mailto::troy_at_[hidden]"> Troy D. Straszheim</a> made the initial version of variant serialization.
<li>Tonko Juricic helped refine and complete project files for VC 7.1 ide
<li>Rene Rivera tracked down several issues related to
Modified: branches/proto/v3/libs/statechart/example/Performance/Performance.cpp
==============================================================================
--- branches/proto/v3/libs/statechart/example/Performance/Performance.cpp (original)
+++ branches/proto/v3/libs/statechart/example/Performance/Performance.cpp 2008-01-03 23:08:53 EST (Thu, 03 Jan 2008)
@@ -1,5 +1,5 @@
//////////////////////////////////////////////////////////////////////////////
-// Copyright 2005-2006 Andreas Huber Doenni
+// Copyright 2005-2008 Andreas Huber Doenni
// Distributed under the Boost Software License, Version 1.0. (See accompany-
// ing file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
//////////////////////////////////////////////////////////////////////////////
Modified: branches/proto/v3/libs/statechart/example/PingPong/PingPong.cpp
==============================================================================
--- branches/proto/v3/libs/statechart/example/PingPong/PingPong.cpp (original)
+++ branches/proto/v3/libs/statechart/example/PingPong/PingPong.cpp 2008-01-03 23:08:53 EST (Thu, 03 Jan 2008)
@@ -1,5 +1,5 @@
//////////////////////////////////////////////////////////////////////////////
-// Copyright 2002-2007 Andreas Huber Doenni
+// Copyright 2002-2008 Andreas Huber Doenni
// Distributed under the Boost Software License, Version 1.0. (See accompany-
// ing file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
//////////////////////////////////////////////////////////////////////////////
Modified: branches/proto/v3/libs/statechart/test/FifoSchedulerTest.cpp
==============================================================================
--- branches/proto/v3/libs/statechart/test/FifoSchedulerTest.cpp (original)
+++ branches/proto/v3/libs/statechart/test/FifoSchedulerTest.cpp 2008-01-03 23:08:53 EST (Thu, 03 Jan 2008)
@@ -1,5 +1,5 @@
//////////////////////////////////////////////////////////////////////////////
-// Copyright 2005-2006 Andreas Huber Doenni
+// Copyright 2005-2008 Andreas Huber Doenni
// Distributed under the Boost Software License, Version 1.0. (See accompany-
// ing file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
//////////////////////////////////////////////////////////////////////////////
Modified: branches/proto/v3/libs/statechart/test/TuTest.cpp
==============================================================================
--- branches/proto/v3/libs/statechart/test/TuTest.cpp (original)
+++ branches/proto/v3/libs/statechart/test/TuTest.cpp 2008-01-03 23:08:53 EST (Thu, 03 Jan 2008)
@@ -1,5 +1,5 @@
//////////////////////////////////////////////////////////////////////////////
-// Copyright 2005-2006 Andreas Huber Doenni
+// Copyright 2005-2008 Andreas Huber Doenni
// Distributed under the Boost Software License, Version 1.0. (See accompany-
// ing file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
//////////////////////////////////////////////////////////////////////////////
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