From 5f110486a94b760596848ac07177538841e31e50 Mon Sep 17 00:00:00 2001 From: Hartmut Kaiser Date: Thu, 15 Dec 2005 02:15:57 +0000 Subject: [PATCH] Fixed missing #pragma warning(pop) directives in Wave. [SVN r32057] --- ChangeLog | 1 + doc/introduction.html | 4 ++-- include/boost/wave/cpp_context.hpp | 3 ++- include/boost/wave/cpplexer/cpp_lex_interface.hpp | 4 ++++ include/boost/wave/cpplexer/re2clex/cpp_re.hpp | 4 ++++ include/boost/wave/grammars/cpp_defined_grammar_gen.hpp | 4 ++++ include/boost/wave/grammars/cpp_expression_grammar_gen.hpp | 4 ++++ include/boost/wave/grammars/cpp_grammar_gen.hpp | 4 ++++ include/boost/wave/grammars/cpp_literal_grammar_gen.hpp | 4 ++++ include/boost/wave/grammars/cpp_predef_macros_gen.hpp | 4 ++++ src/cpplexer/re2clex/cpp_re.inc | 2 +- src/cpplexer/re2clex/strict_cpp_re.inc | 2 +- src/instantiate_cpp_exprgrammar.cpp | 6 ------ src/instantiate_cpp_grammar.cpp | 6 ------ 14 files changed, 35 insertions(+), 17 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5d1c0d3..67ee4f2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -78,6 +78,7 @@ CHANGELOG #pragma's are fdispatched to the interpret_pragma() preprocessing hook. The default value for BOOST_WAVE_PRAGMA_COMMAND is "wave" to ensure complete backward compatibility. +- Added missing #pragma warning(pop) directives. Mon Dec 5 22:05:22 CST 2005 Boost V1.33.1 diff --git a/doc/introduction.html b/doc/introduction.html index a1c7480..fee182b 100644 --- a/doc/introduction.html +++ b/doc/introduction.html @@ -27,7 +27,7 @@ implementation of the mandated C99/C++ preprocessor functionality packed behind a simple to use interface, which integrates well with the well known idioms of the Standard Template Library (STL).

-

The Wave C++ preprocessor is not a monolitic application, +

The Wave C++ preprocessor is not a monolithic application, it's rather a modular library, which exposes mainly a context object and an iterator interface. The context object helps to configure the actual preprocessing process (as search path's, predefined macros, etc.). The exposed iterators are @@ -87,7 +87,7 @@ preprocessing, but allows to use Wave for all of the IDL derivatives.

Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)

Last updated: - Sunday, May 15, 2005 12:23 + Wednesday, December 14, 2005 10:58

diff --git a/include/boost/wave/cpp_context.hpp b/include/boost/wave/cpp_context.hpp index a7af912..523e018 100644 --- a/include/boost/wave/cpp_context.hpp +++ b/include/boost/wave/cpp_context.hpp @@ -123,7 +123,8 @@ public: #if BOOST_WAVE_SUPPORT_PRAGMA_ONCE != 0 , current_filename(fname) #endif - , macros(*this), language(boost::wave::support_cpp) + , macros(*this) + , language(language_support(support_cpp|support_option_convert_trigraphs)) , hooks(hooks_) { macros.init_predefined_macros(fname); diff --git a/include/boost/wave/cpplexer/cpp_lex_interface.hpp b/include/boost/wave/cpplexer/cpp_lex_interface.hpp index 64f9093..67fdd21 100644 --- a/include/boost/wave/cpplexer/cpp_lex_interface.hpp +++ b/include/boost/wave/cpplexer/cpp_lex_interface.hpp @@ -90,6 +90,10 @@ struct lex_input_interface } // namespace wave } // namespace boost +#ifdef BOOST_MSVC +#pragma warning(pop) +#endif + // the suffix header occurs after all of the code #ifdef BOOST_HAS_ABI_HEADERS #include BOOST_ABI_SUFFIX diff --git a/include/boost/wave/cpplexer/re2clex/cpp_re.hpp b/include/boost/wave/cpplexer/re2clex/cpp_re.hpp index 2652cea..677e943 100644 --- a/include/boost/wave/cpplexer/re2clex/cpp_re.hpp +++ b/include/boost/wave/cpplexer/re2clex/cpp_re.hpp @@ -43,6 +43,10 @@ BOOST_WAVE_DECL boost::wave::token_id scan(Scanner *s); } // namespace wave } // namespace boost +#ifdef BOOST_MSVC +#pragma warning(pop) +#endif + // the suffix header occurs after all of the code #ifdef BOOST_HAS_ABI_HEADERS #include BOOST_ABI_SUFFIX diff --git a/include/boost/wave/grammars/cpp_defined_grammar_gen.hpp b/include/boost/wave/grammars/cpp_defined_grammar_gen.hpp index f913cdd..a23312f 100644 --- a/include/boost/wave/grammars/cpp_defined_grammar_gen.hpp +++ b/include/boost/wave/grammars/cpp_defined_grammar_gen.hpp @@ -73,6 +73,10 @@ struct BOOST_WAVE_DECL defined_grammar_gen } // namespace wave } // namespace boost +#ifdef BOOST_MSVC +#pragma warning(pop) +#endif + // the suffix header occurs after all of the code #ifdef BOOST_HAS_ABI_HEADERS #include BOOST_ABI_SUFFIX diff --git a/include/boost/wave/grammars/cpp_expression_grammar_gen.hpp b/include/boost/wave/grammars/cpp_expression_grammar_gen.hpp index 3d7987d..ee06824 100644 --- a/include/boost/wave/grammars/cpp_expression_grammar_gen.hpp +++ b/include/boost/wave/grammars/cpp_expression_grammar_gen.hpp @@ -62,6 +62,10 @@ struct BOOST_WAVE_DECL expression_grammar_gen { } // namespace wave } // namespace boost +#ifdef BOOST_MSVC +#pragma warning(pop) +#endif + // the suffix header occurs after all of the code #ifdef BOOST_HAS_ABI_HEADERS #include BOOST_ABI_SUFFIX diff --git a/include/boost/wave/grammars/cpp_grammar_gen.hpp b/include/boost/wave/grammars/cpp_grammar_gen.hpp index fb4233b..4258de3 100644 --- a/include/boost/wave/grammars/cpp_grammar_gen.hpp +++ b/include/boost/wave/grammars/cpp_grammar_gen.hpp @@ -90,6 +90,10 @@ struct BOOST_WAVE_DECL cpp_grammar_gen } // namespace wave } // namespace boost +#ifdef BOOST_MSVC +#pragma warning(pop) +#endif + // the suffix header occurs after all of the code #ifdef BOOST_HAS_ABI_HEADERS #include BOOST_ABI_SUFFIX diff --git a/include/boost/wave/grammars/cpp_literal_grammar_gen.hpp b/include/boost/wave/grammars/cpp_literal_grammar_gen.hpp index bc0eed6..f7be153 100644 --- a/include/boost/wave/grammars/cpp_literal_grammar_gen.hpp +++ b/include/boost/wave/grammars/cpp_literal_grammar_gen.hpp @@ -64,6 +64,10 @@ struct BOOST_WAVE_DECL chlit_grammar_gen { } // namespace wave } // namespace boost +#ifdef BOOST_MSVC +#pragma warning(pop) +#endif + // the suffix header occurs after all of the code #ifdef BOOST_HAS_ABI_HEADERS #include BOOST_ABI_SUFFIX diff --git a/include/boost/wave/grammars/cpp_predef_macros_gen.hpp b/include/boost/wave/grammars/cpp_predef_macros_gen.hpp index 13603a8..a7b6dae 100644 --- a/include/boost/wave/grammars/cpp_predef_macros_gen.hpp +++ b/include/boost/wave/grammars/cpp_predef_macros_gen.hpp @@ -68,6 +68,10 @@ struct BOOST_WAVE_DECL predefined_macros_grammar_gen } // namespace wave } // namespace boost +#ifdef BOOST_MSVC +#pragma warning(pop) +#endif + // the suffix header occurs after all of the code #ifdef BOOST_HAS_ABI_HEADERS #include BOOST_ABI_SUFFIX diff --git a/src/cpplexer/re2clex/cpp_re.inc b/src/cpplexer/re2clex/cpp_re.inc index 0cc4214..482268b 100644 --- a/src/cpplexer/re2clex/cpp_re.inc +++ b/src/cpplexer/re2clex/cpp_re.inc @@ -1,4 +1,4 @@ -/* Generated by re2c 0.9.10 on Sun Nov 20 20:57:28 2005 */ +/* Generated by re2c 0.9.10 on Sun Nov 27 17:15:20 2005 */ #line 1 "cpp.re" /*============================================================================= Boost.Wave: A Standard compliant C++ preprocessor library diff --git a/src/cpplexer/re2clex/strict_cpp_re.inc b/src/cpplexer/re2clex/strict_cpp_re.inc index 7bab40d..2375e60 100644 --- a/src/cpplexer/re2clex/strict_cpp_re.inc +++ b/src/cpplexer/re2clex/strict_cpp_re.inc @@ -1,4 +1,4 @@ -/* Generated by re2c 0.9.10 on Sun Nov 20 20:57:27 2005 */ +/* Generated by re2c 0.9.10 on Sun Nov 27 17:15:19 2005 */ #line 1 "strict_cpp.re" /*============================================================================= Boost.Wave: A Standard compliant C++ preprocessor library diff --git a/src/instantiate_cpp_exprgrammar.cpp b/src/instantiate_cpp_exprgrammar.cpp index 9e8ee32..76a677e 100644 --- a/src/instantiate_cpp_exprgrammar.cpp +++ b/src/instantiate_cpp_exprgrammar.cpp @@ -25,12 +25,6 @@ #include BOOST_ABI_PREFIX #endif -// suppress warnings about dependent classes not being exported from the dll -#ifdef BOOST_MSVC -#pragma warning(push) -#pragma warning(disable : 4251 4231 4660) -#endif - /////////////////////////////////////////////////////////////////////////////// // // Explicit instantiation of the expression_grammar_gen template with the diff --git a/src/instantiate_cpp_grammar.cpp b/src/instantiate_cpp_grammar.cpp index 2015702..85a1542 100644 --- a/src/instantiate_cpp_grammar.cpp +++ b/src/instantiate_cpp_grammar.cpp @@ -24,12 +24,6 @@ #include BOOST_ABI_PREFIX #endif -// suppress warnings about dependent classes not being exported from the dll -#ifdef BOOST_MSVC -#pragma warning(push) -#pragma warning(disable : 4251 4231 4660) -#endif - /////////////////////////////////////////////////////////////////////////////// // // Explicit instantiation of the cpp_grammar_gen template with the correct