Boost-Commit :

Date view	Thread view	Subject view	Author view

Subject: [Boost-commit] svn:boost r63123 - in branches/release: . boost boost/algorithm/string boost/archive boost/bimap boost/config boost/detail boost/filesystem boost/functional/hash boost/fusion boost/gil boost/graph boost/integer boost/interprocess boost/intrusive boost/iostreams boost/math boost/numeric/ublas boost/program_options boost/property_tree boost/python boost/range boost/serialization boost/signals boost/signals2 boost/spirit boost/spirit/home boost/spirit/home/karma boost/spirit/home/support boost/statechart boost/system boost/thread boost/unordered boost/utility boost/uuid boost/variant boost/wave boost/wave/cpplexer boost/wave/util doc libs libs/array/doc libs/array/test libs/bimap libs/filesystem libs/functional/hash libs/fusion libs/graph_parallel libs/integer libs/interprocess libs/intrusive libs/iostreams libs/math libs/mpl/doc/refmanual libs/mpl/doc/src/refmanual libs/numeric/ublas libs/numeric/ublas/doc libs/program_options libs/property_tree libs/python libs/range libs/range/doc libs/serialization libs/signals libs/signals2 libs/spirit libs/spirit/classic/example libs/spirit/doc libs/spirit/example libs/spirit/phoenix libs/spirit/test libs/spirit/test/qi libs/statechart libs/static_assert libs/system libs/thread libs/timer libs/unordered libs/utility libs/utility/swap/test libs/uuid libs/wave libs/wave/samples/advanced_hooks libs/wave/samples/list_includes/build libs/wave/samples/token_statistics/build more more/getting_started people status tools tools/bcp tools/boostbook tools/build/v2 tools/build/v2/tools tools/inspect tools/jam tools/quickbook tools/regression tools/release tools/wave wiki
From: hartmut.kaiser_at_[hidden]
Date: 2010-06-19 17:48:03

Author: hkaiser
Date: 2010-06-19 17:48:02 EDT (Sat, 19 Jun 2010)
New Revision: 63123
URL: http://svn.boost.org/trac/boost/changeset/63123

Log:
Wave: merging from trunk
Properties modified:
   branches/release/ (props changed)
   branches/release/INSTALL (props changed)
   branches/release/Jamroot (props changed)
   branches/release/LICENSE_1_0.txt (props changed)
   branches/release/boost/ (props changed)
   branches/release/boost-build.jam (props changed)
   branches/release/boost.css (props changed)
   branches/release/boost.png (props changed)
   branches/release/boost/algorithm/string/ (props changed)
   branches/release/boost/archive/ (props changed)
   branches/release/boost/array.hpp (props changed)
   branches/release/boost/bimap/ (props changed)
   branches/release/boost/config/ (props changed)
   branches/release/boost/config.hpp (props changed)
   branches/release/boost/detail/ (props changed)
   branches/release/boost/detail/endian.hpp (props changed)
   branches/release/boost/filesystem/ (props changed)
   branches/release/boost/functional/hash/ (props changed)
   branches/release/boost/fusion/ (props changed)
   branches/release/boost/gil/ (props changed)
   branches/release/boost/graph/ (props changed)
   branches/release/boost/integer/ (props changed)
   branches/release/boost/interprocess/ (props changed)
   branches/release/boost/intrusive/ (props changed)
   branches/release/boost/iostreams/ (props changed)
   branches/release/boost/math/ (props changed)
   branches/release/boost/numeric/ublas/ (props changed)
   branches/release/boost/program_options/ (props changed)
   branches/release/boost/property_tree/ (props changed)
   branches/release/boost/python/ (props changed)
   branches/release/boost/range/ (props changed)
   branches/release/boost/serialization/ (props changed)
   branches/release/boost/serialization/factory.hpp (props changed)
   branches/release/boost/signals/ (props changed)
   branches/release/boost/signals2/ (props changed)
   branches/release/boost/spirit/ (props changed)
   branches/release/boost/spirit/home/ (props changed)
   branches/release/boost/spirit/home/karma/ (props changed)
   branches/release/boost/spirit/home/support/attributes.hpp (props changed)
   branches/release/boost/statechart/ (props changed)
   branches/release/boost/system/ (props changed)
   branches/release/boost/thread/ (props changed)
   branches/release/boost/thread.hpp (props changed)
   branches/release/boost/unordered/ (props changed)
   branches/release/boost/utility/ (props changed)
   branches/release/boost/utility/value_init.hpp (props changed)
   branches/release/boost/uuid/ (props changed)
   branches/release/boost/variant/ (props changed)
   branches/release/boost/version.hpp (props changed)
   branches/release/boost/wave/ (props changed)
   branches/release/bootstrap.bat (props changed)
   branches/release/bootstrap.sh (props changed)
   branches/release/doc/ (props changed)
   branches/release/index.htm (props changed)
   branches/release/index.html (props changed)
   branches/release/libs/ (props changed)
   branches/release/libs/array/doc/array.xml (props changed)
   branches/release/libs/array/test/array0.cpp (props changed)
   branches/release/libs/bimap/ (props changed)
   branches/release/libs/filesystem/ (props changed)
   branches/release/libs/functional/hash/ (props changed)
   branches/release/libs/fusion/ (props changed)
   branches/release/libs/graph_parallel/ (props changed)
   branches/release/libs/integer/ (props changed)
   branches/release/libs/interprocess/ (props changed)
   branches/release/libs/intrusive/ (props changed)
   branches/release/libs/iostreams/ (props changed)
   branches/release/libs/libraries.htm (props changed)
   branches/release/libs/maintainers.txt (props changed)
   branches/release/libs/math/ (props changed)
   branches/release/libs/mpl/doc/refmanual/broken-compiler-workarounds.html (props changed)
   branches/release/libs/mpl/doc/refmanual/categorized-index-concepts.html (props changed)
   branches/release/libs/mpl/doc/refmanual/cfg-no-preprocessed-headers.html (props changed)
   branches/release/libs/mpl/doc/refmanual/composition-and-argument-binding.html (props changed)
   branches/release/libs/mpl/doc/refmanual/data-types-concepts.html (props changed)
   branches/release/libs/mpl/doc/refmanual/data-types-miscellaneous.html (props changed)
   branches/release/libs/mpl/doc/refmanual/extensible-associative-sequence.html (props changed)
   branches/release/libs/mpl/doc/refmanual/inserter-class.html (props changed)
   branches/release/libs/mpl/doc/refmanual/tag-dispatched-metafunction.html (props changed)
   branches/release/libs/mpl/doc/refmanual/trivial-metafunctions-summary.html (props changed)
   branches/release/libs/mpl/doc/src/refmanual/Iterators-Iterator.rst (props changed)
   branches/release/libs/numeric/ublas/ (props changed)
   branches/release/libs/numeric/ublas/doc/ (props changed)
   branches/release/libs/program_options/ (props changed)
   branches/release/libs/property_tree/ (props changed)
   branches/release/libs/python/ (props changed)
   branches/release/libs/range/ (props changed)
   branches/release/libs/range/doc/ (props changed)
   branches/release/libs/serialization/ (props changed)
   branches/release/libs/signals/ (props changed)
   branches/release/libs/signals2/ (props changed)
   branches/release/libs/spirit/ (props changed)
   branches/release/libs/spirit/classic/example/ (props changed)
   branches/release/libs/spirit/doc/ (props changed)
   branches/release/libs/spirit/example/ (props changed)
   branches/release/libs/spirit/phoenix/ (props changed)
   branches/release/libs/spirit/test/ (props changed)
   branches/release/libs/spirit/test/qi/optional.cpp (props changed)
   branches/release/libs/statechart/ (props changed)
   branches/release/libs/static_assert/ (props changed)
   branches/release/libs/system/ (props changed)
   branches/release/libs/thread/ (props changed)
   branches/release/libs/timer/ (props changed)
   branches/release/libs/unordered/ (props changed)
   branches/release/libs/utility/ (props changed)
   branches/release/libs/utility/swap.html (props changed)
   branches/release/libs/utility/swap/test/std_bitset.cpp (props changed)
   branches/release/libs/utility/value_init.htm (props changed)
   branches/release/libs/utility/value_init_test.cpp (props changed)
   branches/release/libs/uuid/ (props changed)
   branches/release/libs/wave/ (props changed)
   branches/release/more/ (props changed)
   branches/release/more/getting_started/ (props changed)
   branches/release/people/ (props changed)
   branches/release/rst.css (props changed)
   branches/release/status/ (props changed)
   branches/release/status/Jamfile.v2 (props changed)
   branches/release/tools/ (props changed)
   branches/release/tools/bcp/ (props changed)
   branches/release/tools/boostbook/ (props changed)
   branches/release/tools/build/v2/ (props changed)
   branches/release/tools/build/v2/tools/ (props changed)
   branches/release/tools/inspect/ (props changed)
   branches/release/tools/jam/ (props changed)
   branches/release/tools/quickbook/ (props changed)
   branches/release/tools/regression/ (props changed)
   branches/release/tools/release/ (props changed)
   branches/release/tools/wave/ (props changed)
   branches/release/wiki/ (props changed)
Text files modified:
   branches/release/boost/wave/cpp_exceptions.hpp | 6 +++---
   branches/release/boost/wave/cpp_iteration_context.hpp | 21 ++++++++++++++++-----
   branches/release/boost/wave/cpplexer/cpplexer_exceptions.hpp | 4 ++--
   branches/release/boost/wave/util/cpp_iterator.hpp | 8 +++++---
   branches/release/boost/wave/wave_config.hpp | 7 +++----
   branches/release/boost/wave/wave_version.hpp | 4 ++--
   branches/release/libs/wave/ChangeLog | 9 +++++++++
   branches/release/libs/wave/samples/advanced_hooks/advanced_hooks.hpp | 2 +-
   branches/release/libs/wave/samples/list_includes/build/Jamfile.v2 | 2 +-
   branches/release/libs/wave/samples/token_statistics/build/Jamfile.v2 | 8 ++++----
   10 files changed, 46 insertions(+), 25 deletions(-)

Modified: branches/release/boost/wave/cpp_exceptions.hpp
==============================================================================
--- branches/release/boost/wave/cpp_exceptions.hpp (original)
+++ branches/release/boost/wave/cpp_exceptions.hpp 2010-06-19 17:48:02 EDT (Sat, 19 Jun 2010)
@@ -62,7 +62,7 @@

///////////////////////////////////////////////////////////////////////////////
// cpp_exception, the base class for all specific C preprocessor exceptions
-class cpp_exception
+class BOOST_SYMBOL_VISIBLE cpp_exception
: public std::exception
{
public:
@@ -95,7 +95,7 @@

///////////////////////////////////////////////////////////////////////////////
// preprocessor error
-class preprocess_exception :
+class BOOST_SYMBOL_VISIBLE preprocess_exception :
public cpp_exception
{
public:
@@ -366,7 +366,7 @@

///////////////////////////////////////////////////////////////////////////////
// Error during macro handling, this exception contains the related macro name
-class macro_handling_exception :
+class BOOST_SYMBOL_VISIBLE macro_handling_exception :
public preprocess_exception
{
public:

Modified: branches/release/boost/wave/cpp_iteration_context.hpp
==============================================================================
--- branches/release/boost/wave/cpp_iteration_context.hpp (original)
+++ branches/release/boost/wave/cpp_iteration_context.hpp 2010-06-19 17:48:02 EDT (Sat, 19 Jun 2010)
@@ -90,11 +90,18 @@
} // namespace iteration_context_policies

///////////////////////////////////////////////////////////////////////////////
-//
+// Base class for iteration contexts
template <typename ContextT, typename IteratorT>
struct base_iteration_context
{
-public:
+ enum file_type
+ {
+ // this iteration context handles ...
+ main_file, // ... the main preprocessed file
+ system_header, // ... a header file included used #include <>
+ user_header // ... a header file included using #include ""
+ };
+
     base_iteration_context(ContextT& ctx_,
             BOOST_WAVE_STRINGTYPE const &fname, std::size_t if_block_depth = 0)
     : real_filename(fname), real_relative_filename(fname), filename(fname),
@@ -102,7 +109,8 @@
     {}
     base_iteration_context(ContextT& ctx_,
             IteratorT const &first_, IteratorT const &last_,
- BOOST_WAVE_STRINGTYPE const &fname, std::size_t if_block_depth = 0)
+ BOOST_WAVE_STRINGTYPE const &fname, std::size_t if_block_depth = 0,
+ file_type type = main_file)
     : first(first_), last(last_), real_filename(fname),
         real_relative_filename(fname), filename(fname),
         line(1), emitted_lines(0), if_block_depth(if_block_depth), ctx(ctx_)
@@ -118,6 +126,7 @@
     unsigned int emitted_lines; // count of emitted newlines
     std::size_t if_block_depth; // depth of #if block recursion
     ContextT& ctx; // corresponding context<> object
+ file_type type; // the type of the handled file
};

///////////////////////////////////////////////////////////////////////////////
@@ -134,12 +143,14 @@
     typedef IteratorT iterator_type;
     typedef typename IteratorT::token_type::position_type position_type;

+ typedef base_iteration_context<ContextT, IteratorT> base_type;
     typedef iteration_context<ContextT, IteratorT, InputPolicyT> self_type;

     iteration_context(ContextT& ctx, BOOST_WAVE_STRINGTYPE const &fname,
             position_type const &act_pos,
- boost::wave::language_support language_)
- : base_iteration_context<ContextT, IteratorT>(ctx, fname)
+ boost::wave::language_support language_,
+ typename base_type::file_type type = base_type::main_file)
+ : base_iteration_context<ContextT, IteratorT>(ctx, fname, type)
     {
         InputPolicyT::template inner<self_type>::init_iterators(
             *this, act_pos, language_);

Modified: branches/release/boost/wave/cpplexer/cpplexer_exceptions.hpp
==============================================================================
--- branches/release/boost/wave/cpplexer/cpplexer_exceptions.hpp (original)
+++ branches/release/boost/wave/cpplexer/cpplexer_exceptions.hpp 2010-06-19 17:48:02 EDT (Sat, 19 Jun 2010)
@@ -128,7 +128,7 @@

///////////////////////////////////////////////////////////////////////////////
// cpplexer_exception, the base class for all specific C++ lexer exceptions
-class cpplexer_exception
+class BOOST_SYMBOL_VISIBLE cpplexer_exception
: public std::exception
{
public:
@@ -160,7 +160,7 @@

///////////////////////////////////////////////////////////////////////////////
// lexing_exception error
-class lexing_exception :
+class BOOST_SYMBOL_VISIBLE lexing_exception :
public cpplexer_exception
{
public:

Modified: branches/release/boost/wave/util/cpp_iterator.hpp
==============================================================================
--- branches/release/boost/wave/util/cpp_iterator.hpp (original)
+++ branches/release/boost/wave/util/cpp_iterator.hpp 2010-06-19 17:48:02 EDT (Sat, 19 Jun 2010)
@@ -277,8 +277,8 @@
                 lexer_type(),
                 pos_.get_file().c_str()
             )),
- seen_newline(true), must_emit_line_directive(false),
- act_pos(ctx_.get_main_pos()),
+ seen_newline(true), skipped_newline(false),
+ must_emit_line_directive(false), act_pos(ctx_.get_main_pos()),
         whitespace(boost::wave::need_insert_whitespace(ctx.get_language()))
     {
         act_pos.set_file(pos_.get_file());
@@ -1572,7 +1572,9 @@
     // preprocess the opened file
     boost::shared_ptr<base_iteration_context_type> new_iter_ctx (
         new iteration_context_type(ctx, native_path_str.c_str(), act_pos,
- boost::wave::enable_prefer_pp_numbers(ctx.get_language())));
+ boost::wave::enable_prefer_pp_numbers(ctx.get_language()),
+ is_system ? base_iteration_context_type::system_header :
+ base_iteration_context_type::user_header));

     // call the include policy trace function
#if BOOST_WAVE_USE_DEPRECIATED_PREPROCESSING_HOOKS != 0

Modified: branches/release/boost/wave/wave_config.hpp
==============================================================================
--- branches/release/boost/wave/wave_config.hpp (original)
+++ branches/release/boost/wave/wave_config.hpp 2010-06-19 17:48:02 EDT (Sat, 19 Jun 2010)
@@ -403,15 +403,14 @@

///////////////////////////////////////////////////////////////////////////////
// Set up dll import/export options
-#if defined(BOOST_HAS_DECLSPEC) && \
- (defined(BOOST_WAVE_DYN_LINK) || defined(BOOST_ALL_DYN_LINK)) && \
+#if (defined(BOOST_WAVE_DYN_LINK) || defined(BOOST_ALL_DYN_LINK)) && \
!defined(BOOST_WAVE_STATIC_LINK)

#if defined(BOOST_WAVE_SOURCE)
-#define BOOST_WAVE_DECL __declspec(dllexport)
+#define BOOST_WAVE_DECL BOOST_SYMBOL_EXPORT
#define BOOST_WAVE_BUILD_DLL
#else
-#define BOOST_WAVE_DECL __declspec(dllimport)
+#define BOOST_WAVE_DECL BOOST_SYMBOL_IMPORT
#endif

#endif // building a shared library

Modified: branches/release/boost/wave/wave_version.hpp
==============================================================================
--- branches/release/boost/wave/wave_version.hpp (original)
+++ branches/release/boost/wave/wave_version.hpp 2010-06-19 17:48:02 EDT (Sat, 19 Jun 2010)
@@ -16,11 +16,11 @@
// BOOST_WAVE_VERSION & 0x0000FF is the sub-minor version
// BOOST_WAVE_VERSION & 0x00FF00 is the minor version
// BOOST_WAVE_VERSION & 0xFF0000 is the major version
-#define BOOST_WAVE_VERSION 0x020005
+#define BOOST_WAVE_VERSION 0x020006

// The following defines contain the same information as above
#define BOOST_WAVE_VERSION_MAJOR 2
#define BOOST_WAVE_VERSION_MINOR 0
-#define BOOST_WAVE_VERSION_SUBMINOR 5
+#define BOOST_WAVE_VERSION_SUBMINOR 6

#endif // !defined(WAVE_VERSION_H_9D79ABDB_AC54_4C0A_89B1_F70A2DCFE21E_INCLUDED)

Modified: branches/release/libs/wave/ChangeLog
==============================================================================
--- branches/release/libs/wave/ChangeLog (original)
+++ branches/release/libs/wave/ChangeLog 2010-06-19 17:48:02 EDT (Sat, 19 Jun 2010)
@@ -20,6 +20,15 @@

CHANGELOG

+Boost V1.44.0
+- V2.0.6
+- Added information about the file type to iteration context. This can be
+ either main_file, system_header, or user_header depending whether the handled
+ file is the main file to preprocess, a include file opened from `#include <>`,
+ or a include file opened from `#include ""`.
+- Added support for new Boost visibility macros. Properly exported all
+ exceptions, etc.
+
Boost V1.43.0
- V2.0.5
- Fixed the wave driver application to strip leading and trailing whitespace

Modified: branches/release/libs/wave/samples/advanced_hooks/advanced_hooks.hpp
==============================================================================
--- branches/release/libs/wave/samples/advanced_hooks/advanced_hooks.hpp (original)
+++ branches/release/libs/wave/samples/advanced_hooks/advanced_hooks.hpp 2010-06-19 17:48:02 EDT (Sat, 19 Jun 2010)
@@ -151,7 +151,7 @@
     {
         // prepend a comment at the beginning of all skipped lines
         using namespace boost::wave;
- if (need_comment) {
+ if (need_comment && token_id(token) != T_SPACE) {
             std::cout << "// ";
             need_comment = false;
         }

Modified: branches/release/libs/wave/samples/list_includes/build/Jamfile.v2
==============================================================================
--- branches/release/libs/wave/samples/list_includes/build/Jamfile.v2 (original)
+++ branches/release/libs/wave/samples/list_includes/build/Jamfile.v2 2010-06-19 17:48:02 EDT (Sat, 19 Jun 2010)
@@ -9,7 +9,7 @@
# LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)

SOURCES =
- ../list_includes.cpp
+ ../list_includes
         ../instantiate_cpp_exprgrammar
         ../instantiate_cpp_grammar
         ../instantiate_cpp_literalgrs

Modified: branches/release/libs/wave/samples/token_statistics/build/Jamfile.v2
==============================================================================
--- branches/release/libs/wave/samples/token_statistics/build/Jamfile.v2 (original)
+++ branches/release/libs/wave/samples/token_statistics/build/Jamfile.v2 2010-06-19 17:48:02 EDT (Sat, 19 Jun 2010)
@@ -9,10 +9,10 @@
# LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)

SOURCES =
- ../token_statistics.cpp
- ../instantiate_xlex_lexer.cpp
- ../instantiate_cpp_grammar.cpp
- ../instantiate_defined_grammar.cpp
+ ../token_statistics
+ ../instantiate_xlex_lexer
+ ../instantiate_cpp_grammar
+ ../instantiate_defined_grammar
;

exe token_statistics

Date view	Thread view	Subject view	Author view

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