|
|
Boost-Commit : |
Subject: [Boost-commit] svn:boost r57445 - in branches/release: boost/wave boost/wave/util libs/wave libs/wave/src libs/wave/src/cpplexer/re2clex libs/wave/test/build libs/wave/test/testlexers libs/wave/test/testwave tools/wave
From: hartmut.kaiser_at_[hidden]
Date: 2009-11-07 09:18:27
Author: hkaiser
Date: 2009-11-07 09:18:25 EST (Sat, 07 Nov 2009)
New Revision: 57445
URL: http://svn.boost.org/trac/boost/changeset/57445
Log:
Wave: merging fixes from trunk
Properties modified:
branches/release/boost/wave/ (props changed)
branches/release/libs/wave/ (props changed)
branches/release/tools/wave/ (props changed)
Text files modified:
branches/release/boost/wave/util/flex_string.hpp | 115 ++++++++++++++++++++-------------------
branches/release/boost/wave/util/pattern_parser.hpp | 4
branches/release/libs/wave/ChangeLog | 2
branches/release/libs/wave/src/cpplexer/re2clex/aq.cpp | 4 +
branches/release/libs/wave/src/cpplexer/re2clex/cpp_re.cpp | 4 +
branches/release/libs/wave/src/instantiate_cpp_exprgrammar.cpp | 3 +
branches/release/libs/wave/src/instantiate_cpp_grammar.cpp | 3 +
branches/release/libs/wave/src/instantiate_cpp_literalgrs.cpp | 3 +
branches/release/libs/wave/src/instantiate_defined_grammar.cpp | 3 +
branches/release/libs/wave/src/instantiate_predef_macros.cpp | 3 +
branches/release/libs/wave/src/instantiate_re2c_lexer.cpp | 3 +
branches/release/libs/wave/src/instantiate_re2c_lexer_str.cpp | 3 +
branches/release/libs/wave/src/token_ids.cpp | 4 +
branches/release/libs/wave/src/wave_config_constant.cpp | 4 +
branches/release/libs/wave/test/build/Jamfile.v2 | 16 ++--
branches/release/libs/wave/test/testlexers/test_re2c_lexer.cpp | 3 +
branches/release/libs/wave/test/testlexers/test_slex_lexer.cpp | 3 +
branches/release/libs/wave/test/testlexers/test_xlex_lexer.cpp | 3 +
branches/release/libs/wave/test/testwave/testwave.cpp | 3 +
branches/release/libs/wave/test/testwave/testwave_app.cpp | 12 ++++
20 files changed, 131 insertions(+), 67 deletions(-)
Modified: branches/release/boost/wave/util/flex_string.hpp
==============================================================================
--- branches/release/boost/wave/util/flex_string.hpp (original)
+++ branches/release/boost/wave/util/flex_string.hpp 2009-11-07 09:18:25 EST (Sat, 07 Nov 2009)
@@ -325,7 +325,7 @@
E buffer_[1];
};
static const Data emptyString_;
-
+
typedef typename A::size_type size_type;
private:
@@ -342,7 +342,7 @@
{
// 11-17-2000: comment added:
// No need to allocate (capacity + 1) to
- // accomodate the terminating 0, because Data already
+ // accommodate the terminating 0, because Data already
// has one one character in there
pData_ = static_cast<Data*>(
malloc(sizeof(Data) + capacity * sizeof(E)));
@@ -351,34 +351,34 @@
pData_->pEndOfMem_ = pData_->buffer_ + capacity;
}
}
-
+
private:
// Warning - this doesn't initialize pData_. Used in reserve()
SimpleStringStorage()
{ }
-
+
public:
typedef E value_type;
typedef E* iterator;
typedef const E* const_iterator;
typedef A allocator_type;
-
+
SimpleStringStorage(const SimpleStringStorage& rhs)
{
const size_type sz = rhs.size();
Init(sz, sz);
if (sz) flex_string_details::pod_copy(rhs.begin(), rhs.end(), begin());
}
-
+
SimpleStringStorage(const SimpleStringStorage& s,
flex_string_details::Shallow)
: pData_(s.pData_)
{
}
-
+
SimpleStringStorage(const A&)
{ pData_ = const_cast<Data*>(&emptyString_); }
-
+
SimpleStringStorage(const E* s, size_type len, const A&)
{
Init(len, len);
@@ -390,7 +390,7 @@
Init(len, len);
flex_string_details::pod_fill(begin(), end(), c);
}
-
+
SimpleStringStorage& operator=(const SimpleStringStorage& rhs)
{
const size_type sz = rhs.size();
@@ -408,16 +408,16 @@
iterator begin()
{ return pData_->buffer_; }
-
+
const_iterator begin() const
{ return pData_->buffer_; }
-
+
iterator end()
{ return pData_->pEnd_; }
-
+
const_iterator end() const
{ return pData_->pEnd_; }
-
+
size_type size() const
{ return pData_->pEnd_ - pData_->buffer_; }
@@ -479,7 +479,7 @@
flex_string_details::pod_copy(s, s + sz, end());
pData_->pEnd_ += sz;
}
-
+
template <class InputIterator>
void append(InputIterator b, InputIterator e)
{
@@ -527,12 +527,8 @@
template <typename E, class A>
const typename SimpleStringStorage<E, A>::Data
-SimpleStringStorage<E, A>::emptyString_ = typename SimpleStringStorage<E, A>::Data();
-//{
-// const_cast<E*>(SimpleStringStorage<E, A>::emptyString_.buffer_),
-// const_cast<E*>(SimpleStringStorage<E, A>::emptyString_.buffer_),
-// { E() }
-//};
+SimpleStringStorage<E, A>::emptyString_ =
+ typename SimpleStringStorage<E, A>::Data();
////////////////////////////////////////////////////////////////////////////////
// class template AllocatorStringStorage
@@ -584,13 +580,13 @@
pData_->pEndOfMem_ = pData_->buffer_ + cap;
}
}
-
+
public:
typedef E value_type;
+ typedef E* iterator;
+ typedef const E* const_iterator;
typedef A allocator_type;
- typedef typename A::pointer iterator;
- typedef typename A::const_pointer const_iterator;
-
+
AllocatorStringStorage()
: A(), pData_(0)
{
@@ -603,24 +599,24 @@
Init(sz, sz);
if (sz) flex_string_details::pod_copy(rhs.begin(), rhs.end(), begin());
}
-
+
AllocatorStringStorage(const AllocatorStringStorage& s,
flex_string_details::Shallow)
: A(s.get_allocator())
{
pData_ = s.pData_;
}
-
+
AllocatorStringStorage(const A& a) : A(a)
{
pData_ = const_cast<Data*>(
&SimpleStringStorage<E, A>::emptyString_);
}
-
+
AllocatorStringStorage(const E* s, size_type len, const A& a)
: A(a)
{
- Init(len, len);
+ Init(len, len);
flex_string_details::pod_copy(s, s + len, begin());
}
@@ -630,7 +626,7 @@
Init(len, len);
flex_string_details::pod_fill(&*begin(), &*end(), c);
}
-
+
AllocatorStringStorage& operator=(const AllocatorStringStorage& rhs)
{
const size_type sz = rhs.size();
@@ -639,7 +635,7 @@
pData_->pEnd_ = &*begin() + rhs.size();
return *this;
}
-
+
~AllocatorStringStorage()
{
if (capacity())
@@ -648,19 +644,19 @@
sizeof(Data) + capacity() * sizeof(E));
}
}
-
+
iterator begin()
{ return pData_->buffer_; }
-
+
const_iterator begin() const
{ return pData_->buffer_; }
-
+
iterator end()
{ return pData_->pEnd_; }
-
+
const_iterator end() const
{ return pData_->pEnd_; }
-
+
size_type size() const
{ return size_type(end() - begin()); }
@@ -690,13 +686,13 @@
// @@@ shrink to fit here
return;
}
-
+
A& myAlloc = *this;
AllocatorStringStorage newStr(myAlloc);
newStr.Init(size(), res_arg);
-
+
flex_string_details::pod_copy(begin(), end(), newStr.begin());
-
+
swap(newStr);
}
@@ -716,14 +712,14 @@
std::copy(b, e, end());
pData_->pEnd_ += sz;
}
-
+
void swap(AllocatorStringStorage& rhs)
{
// @@@ The following line is commented due to a bug in MSVC
//std::swap(lhsAlloc, rhsAlloc);
std::swap(pData_, rhs.pData_);
}
-
+
const E* c_str() const
{
if (pData_ != &SimpleStringStorage<E, A>::emptyString_)
@@ -735,7 +731,7 @@
const E* data() const
{ return &*begin(); }
-
+
A get_allocator() const
{ return *this; }
};
@@ -894,26 +890,26 @@
mutable value_type buf_[maxSmallString + 1];
Align align_;
};
-
+
Storage& GetStorage()
{
BOOST_ASSERT(buf_[maxSmallString] == magic);
Storage* p = reinterpret_cast<Storage*>(&buf_[0]);
return *p;
}
-
+
const Storage& GetStorage() const
{
BOOST_ASSERT(buf_[maxSmallString] == magic);
const Storage *p = reinterpret_cast<const Storage*>(&buf_[0]);
return *p;
}
-
+
bool Small() const
{
return buf_[maxSmallString] != magic;
}
-
+
public:
SmallStringOpt(const SmallStringOpt& s)
{
@@ -930,12 +926,12 @@
}
buf_[maxSmallString] = s.buf_[maxSmallString];
}
-
+
SmallStringOpt(const allocator_type&)
{
buf_[maxSmallString] = maxSmallString;
}
-
+
SmallStringOpt(const value_type* s, size_type len, const allocator_type& a)
{
if (len <= maxSmallString)
@@ -963,7 +959,7 @@
buf_[maxSmallString] = magic;
}
}
-
+
SmallStringOpt& operator=(const SmallStringOpt& rhs)
{
reserve(rhs.size());
@@ -982,25 +978,25 @@
if (Small()) return buf_;
return &*GetStorage().begin();
}
-
+
const_iterator begin() const
{
if (Small()) return buf_;
return &*GetStorage().begin();
}
-
+
iterator end()
{
if (Small()) return buf_ + maxSmallString - buf_[maxSmallString];
return &*GetStorage().end();
}
-
+
const_iterator end() const
{
if (Small()) return buf_ + maxSmallString - buf_[maxSmallString];
return &*GetStorage().end();
}
-
+
size_type size() const
{
BOOST_ASSERT(!Small() || maxSmallString >= buf_[maxSmallString]);
@@ -1033,7 +1029,7 @@
}
BOOST_ASSERT(capacity() >= res_arg);
}
-
+
void append(const value_type* s, size_type sz)
{
if (!Small())
@@ -1066,7 +1062,7 @@
}
}
}
-
+
template <class InputIterator>
void append(InputIterator b, InputIterator e)
{
@@ -1166,7 +1162,7 @@
}
}
}
-
+
const value_type* c_str() const
{
if (!Small()) return GetStorage().c_str();
@@ -1211,7 +1207,10 @@
};
Storage& Data() const
- { return *reinterpret_cast<Storage*>(buf_); }
+ {
+ Storage* p = reinterpret_cast<Storage*>(&buf_[0]);
+ return *p;
+ }
RefCountType GetRefs() const
{
@@ -1240,8 +1239,10 @@
} temp;
--(*Data().begin()); // decrement the use count of the remaining object
+
+ Storage* p = reinterpret_cast<Storage*>(&temp.buf_[0]);
new(buf_) Storage(
- *new(temp.buf_) Storage(Data()),
+ *new(p) Storage(Data()),
flex_string_details::Shallow());
*Data().begin() = 1;
}
Modified: branches/release/boost/wave/util/pattern_parser.hpp
==============================================================================
--- branches/release/boost/wave/util/pattern_parser.hpp (original)
+++ branches/release/boost/wave/util/pattern_parser.hpp 2009-11-07 09:18:25 EST (Sat, 07 Nov 2009)
@@ -50,8 +50,8 @@
template <typename CharT>
inline pattern_and<CharT>
- pattern_p(CharT pattern, long pattern_mask = 0L)
- { return pattern_and<CharT>(pattern, (unsigned long)pattern_mask); }
+ pattern_p(CharT pattern, unsigned long pattern_mask = 0UL)
+ { return pattern_and<CharT>(pattern, pattern_mask); }
///////////////////////////////////////////////////////////////////////////////
} // namespace util
Modified: branches/release/libs/wave/ChangeLog
==============================================================================
--- branches/release/libs/wave/ChangeLog (original)
+++ branches/release/libs/wave/ChangeLog 2009-11-07 09:18:25 EST (Sat, 07 Nov 2009)
@@ -42,6 +42,8 @@
- Added a new command line option to the wave driver tool: --listguards/-g
allowing to trace all include files which are either contain a #pragma once
or contain include guards.
+- Started to elminate g++ struct aliasing warnings (more to fix, mostly in
+ flex_string).
Boost V1.40.0
- V2.0.2
Modified: branches/release/libs/wave/src/cpplexer/re2clex/aq.cpp
==============================================================================
--- branches/release/libs/wave/src/cpplexer/re2clex/aq.cpp (original)
+++ branches/release/libs/wave/src/cpplexer/re2clex/aq.cpp 2009-11-07 09:18:25 EST (Sat, 07 Nov 2009)
@@ -9,6 +9,10 @@
=============================================================================*/
#define BOOST_WAVE_SOURCE 1
+
+// disable stupid compiler warnings
+#include <boost/config/warning_disable.hpp>
+
#include <cstdlib>
#include <cstring>
Modified: branches/release/libs/wave/src/cpplexer/re2clex/cpp_re.cpp
==============================================================================
--- branches/release/libs/wave/src/cpplexer/re2clex/cpp_re.cpp (original)
+++ branches/release/libs/wave/src/cpplexer/re2clex/cpp_re.cpp 2009-11-07 09:18:25 EST (Sat, 07 Nov 2009)
@@ -13,6 +13,10 @@
=============================================================================*/
#define BOOST_WAVE_SOURCE 1
+
+// disable stupid compiler warnings
+#include <boost/config/warning_disable.hpp>
+
#include <ctime>
#include <cstdlib>
#include <cstdio>
Modified: branches/release/libs/wave/src/instantiate_cpp_exprgrammar.cpp
==============================================================================
--- branches/release/libs/wave/src/instantiate_cpp_exprgrammar.cpp (original)
+++ branches/release/libs/wave/src/instantiate_cpp_exprgrammar.cpp 2009-11-07 09:18:25 EST (Sat, 07 Nov 2009)
@@ -8,6 +8,9 @@
=============================================================================*/
#define BOOST_WAVE_SOURCE 1
+
+// disable stupid compiler warnings
+#include <boost/config/warning_disable.hpp>
#include <boost/wave/wave_config.hpp>
#if BOOST_WAVE_SEPARATE_GRAMMAR_INSTANTIATION != 0
Modified: branches/release/libs/wave/src/instantiate_cpp_grammar.cpp
==============================================================================
--- branches/release/libs/wave/src/instantiate_cpp_grammar.cpp (original)
+++ branches/release/libs/wave/src/instantiate_cpp_grammar.cpp 2009-11-07 09:18:25 EST (Sat, 07 Nov 2009)
@@ -8,6 +8,9 @@
=============================================================================*/
#define BOOST_WAVE_SOURCE 1
+
+// disable stupid compiler warnings
+#include <boost/config/warning_disable.hpp>
#include <boost/wave/wave_config.hpp>
#if BOOST_WAVE_SEPARATE_GRAMMAR_INSTANTIATION != 0
Modified: branches/release/libs/wave/src/instantiate_cpp_literalgrs.cpp
==============================================================================
--- branches/release/libs/wave/src/instantiate_cpp_literalgrs.cpp (original)
+++ branches/release/libs/wave/src/instantiate_cpp_literalgrs.cpp 2009-11-07 09:18:25 EST (Sat, 07 Nov 2009)
@@ -8,6 +8,9 @@
=============================================================================*/
#define BOOST_WAVE_SOURCE 1
+
+// disable stupid compiler warnings
+#include <boost/config/warning_disable.hpp>
#include <boost/wave/wave_config.hpp>
#if BOOST_WAVE_SEPARATE_GRAMMAR_INSTANTIATION != 0
Modified: branches/release/libs/wave/src/instantiate_defined_grammar.cpp
==============================================================================
--- branches/release/libs/wave/src/instantiate_defined_grammar.cpp (original)
+++ branches/release/libs/wave/src/instantiate_defined_grammar.cpp 2009-11-07 09:18:25 EST (Sat, 07 Nov 2009)
@@ -8,6 +8,9 @@
=============================================================================*/
#define BOOST_WAVE_SOURCE 1
+
+// disable stupid compiler warnings
+#include <boost/config/warning_disable.hpp>
#include <boost/wave/wave_config.hpp>
#if BOOST_WAVE_SEPARATE_GRAMMAR_INSTANTIATION != 0
Modified: branches/release/libs/wave/src/instantiate_predef_macros.cpp
==============================================================================
--- branches/release/libs/wave/src/instantiate_predef_macros.cpp (original)
+++ branches/release/libs/wave/src/instantiate_predef_macros.cpp 2009-11-07 09:18:25 EST (Sat, 07 Nov 2009)
@@ -8,6 +8,9 @@
=============================================================================*/
#define BOOST_WAVE_SOURCE 1
+
+// disable stupid compiler warnings
+#include <boost/config/warning_disable.hpp>
#include <boost/wave/wave_config.hpp>
#if BOOST_WAVE_SEPARATE_GRAMMAR_INSTANTIATION != 0
Modified: branches/release/libs/wave/src/instantiate_re2c_lexer.cpp
==============================================================================
--- branches/release/libs/wave/src/instantiate_re2c_lexer.cpp (original)
+++ branches/release/libs/wave/src/instantiate_re2c_lexer.cpp 2009-11-07 09:18:25 EST (Sat, 07 Nov 2009)
@@ -10,6 +10,9 @@
=============================================================================*/
#define BOOST_WAVE_SOURCE 1
+
+// disable stupid compiler warnings
+#include <boost/config/warning_disable.hpp>
#include <boost/wave/wave_config.hpp> // configuration data
#if BOOST_WAVE_SEPARATE_LEXER_INSTANTIATION != 0
Modified: branches/release/libs/wave/src/instantiate_re2c_lexer_str.cpp
==============================================================================
--- branches/release/libs/wave/src/instantiate_re2c_lexer_str.cpp (original)
+++ branches/release/libs/wave/src/instantiate_re2c_lexer_str.cpp 2009-11-07 09:18:25 EST (Sat, 07 Nov 2009)
@@ -10,6 +10,9 @@
=============================================================================*/
#define BOOST_WAVE_SOURCE 1
+
+// disable stupid compiler warnings
+#include <boost/config/warning_disable.hpp>
#include <boost/wave/wave_config.hpp> // configuration data
#if BOOST_WAVE_SEPARATE_LEXER_INSTANTIATION != 0
Modified: branches/release/libs/wave/src/token_ids.cpp
==============================================================================
--- branches/release/libs/wave/src/token_ids.cpp (original)
+++ branches/release/libs/wave/src/token_ids.cpp 2009-11-07 09:18:25 EST (Sat, 07 Nov 2009)
@@ -11,6 +11,10 @@
=============================================================================*/
#define BOOST_WAVE_SOURCE 1
+
+// disable stupid compiler warnings
+#include <boost/config/warning_disable.hpp>
+
#include <string>
#include <boost/assert.hpp>
#include <boost/static_assert.hpp>
Modified: branches/release/libs/wave/src/wave_config_constant.cpp
==============================================================================
--- branches/release/libs/wave/src/wave_config_constant.cpp (original)
+++ branches/release/libs/wave/src/wave_config_constant.cpp 2009-11-07 09:18:25 EST (Sat, 07 Nov 2009)
@@ -10,6 +10,10 @@
=============================================================================*/
#define BOOST_WAVE_SOURCE 1
+
+// disable stupid compiler warnings
+#include <boost/config/warning_disable.hpp>
+
#include <cstring>
#include <boost/preprocessor/stringize.hpp>
Modified: branches/release/libs/wave/test/build/Jamfile.v2
==============================================================================
--- branches/release/libs/wave/test/build/Jamfile.v2 (original)
+++ branches/release/libs/wave/test/build/Jamfile.v2 2009-11-07 09:18:25 EST (Sat, 07 Nov 2009)
@@ -77,8 +77,8 @@
<threading>multi
<variant>debug
<link>shared:<define>BOOST_ALL_DYN_LINK=1
- <toolset>msvc-8.0:<define>_SCL_SECURE_NO_DEPRECATE
- <toolset>msvc-8.0:<define>_CRT_SECURE_NO_DEPRECATE
+ <toolset>msvc:<define>_SCL_SECURE_NO_DEPRECATE
+ <toolset>msvc:<define>_CRT_SECURE_NO_DEPRECATE
# <define>BOOST_LIB_DIAGNOSTIC=1
:
# name
@@ -106,8 +106,8 @@
<threading>multi
<variant>debug
<link>static # Linking to DLL tested by testwave_dll
- <toolset>msvc-8.0:<define>_SCL_SECURE_NO_DEPRECATE
- <toolset>msvc-8.0:<define>_CRT_SECURE_NO_DEPRECATE
+ <toolset>msvc:<define>_SCL_SECURE_NO_DEPRECATE
+ <toolset>msvc:<define>_CRT_SECURE_NO_DEPRECATE
# <define>BOOST_LIB_DIAGNOSTIC=1
:
# name
@@ -133,8 +133,8 @@
# requirements
<threading>multi
<variant>debug
- <toolset>msvc-8.0:<define>_SCL_SECURE_NO_DEPRECATE
- <toolset>msvc-8.0:<define>_CRT_SECURE_NO_DEPRECATE
+ <toolset>msvc:<define>_SCL_SECURE_NO_DEPRECATE
+ <toolset>msvc:<define>_CRT_SECURE_NO_DEPRECATE
:
# name
test_slex_lexer
@@ -158,8 +158,8 @@
# requirements
<threading>multi
<variant>debug
- <toolset>msvc-8.0:<define>_SCL_SECURE_NO_DEPRECATE
- <toolset>msvc-8.0:<define>_CRT_SECURE_NO_DEPRECATE
+ <toolset>msvc:<define>_SCL_SECURE_NO_DEPRECATE
+ <toolset>msvc:<define>_CRT_SECURE_NO_DEPRECATE
:
# name
test_re2c_lexer
Modified: branches/release/libs/wave/test/testlexers/test_re2c_lexer.cpp
==============================================================================
--- branches/release/libs/wave/test/testlexers/test_re2c_lexer.cpp (original)
+++ branches/release/libs/wave/test/testlexers/test_re2c_lexer.cpp 2009-11-07 09:18:25 EST (Sat, 07 Nov 2009)
@@ -7,6 +7,9 @@
LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
=============================================================================*/
+// disable stupid compiler warnings
+#include <boost/config/warning_disable.hpp>
+
// system headers
#include <string>
#include <iostream>
Modified: branches/release/libs/wave/test/testlexers/test_slex_lexer.cpp
==============================================================================
--- branches/release/libs/wave/test/testlexers/test_slex_lexer.cpp (original)
+++ branches/release/libs/wave/test/testlexers/test_slex_lexer.cpp 2009-11-07 09:18:25 EST (Sat, 07 Nov 2009)
@@ -7,6 +7,9 @@
LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
=============================================================================*/
+// disable stupid compiler warnings
+#include <boost/config/warning_disable.hpp>
+
// system headers
#include <string>
#include <iostream>
Modified: branches/release/libs/wave/test/testlexers/test_xlex_lexer.cpp
==============================================================================
--- branches/release/libs/wave/test/testlexers/test_xlex_lexer.cpp (original)
+++ branches/release/libs/wave/test/testlexers/test_xlex_lexer.cpp 2009-11-07 09:18:25 EST (Sat, 07 Nov 2009)
@@ -7,6 +7,9 @@
LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
=============================================================================*/
+// disable stupid compiler warnings
+#include <boost/config/warning_disable.hpp>
+
// system headers
#include <string>
#include <iostream>
Modified: branches/release/libs/wave/test/testwave/testwave.cpp
==============================================================================
--- branches/release/libs/wave/test/testwave/testwave.cpp (original)
+++ branches/release/libs/wave/test/testwave/testwave.cpp 2009-11-07 09:18:25 EST (Sat, 07 Nov 2009)
@@ -7,6 +7,9 @@
LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
=============================================================================*/
+// disable stupid compiler warnings
+#include <boost/config/warning_disable.hpp>
+
// system headers
#include <string>
#include <iostream>
Modified: branches/release/libs/wave/test/testwave/testwave_app.cpp
==============================================================================
--- branches/release/libs/wave/test/testwave/testwave_app.cpp (original)
+++ branches/release/libs/wave/test/testwave/testwave_app.cpp 2009-11-07 09:18:25 EST (Sat, 07 Nov 2009)
@@ -7,10 +7,14 @@
LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
=============================================================================*/
+// disable stupid compiler warnings
+#include <boost/config/warning_disable.hpp>
+
// system headers
#include <string>
#include <iostream>
#include <vector>
+#include <ctime>
// include boost
#include <boost/config.hpp>
@@ -35,6 +39,14 @@
#include "testwave_app.hpp"
#include "collect_hooks_information.hpp"
+# ifdef BOOST_NO_STDC_NAMESPACE
+namespace std
+{
+ using ::asctime; using ::gmtime; using ::localtime;
+ using ::difftime; using ::time; using ::tm; using ::mktime; using ::system;
+}
+# endif
+
namespace po = boost::program_options;
namespace fs = boost::filesystem;
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