[Boost-commit] svn:boost r47602 - in branches/release: boost boost/spirit/include libs/spirit/classic/test libs/spirit/test status

From: hartmut.kaiser_at_[hidden]
Date: 2008-07-19 12:48:43

Author: hkaiser
Date: 2008-07-19 12:48:42 EDT (Sat, 19 Jul 2008)
New Revision: 47602
URL: http://svn.boost.org/trac/boost/changeset/47602

Log:
Spirit: re-enabled testing of Spirit.Classic, fixed failing Spirit.Classic test cases, added missing file

Added:
   branches/release/boost/spirit/include/classic_spirit.hpp   (contents, props changed)
Text files modified: 
   branches/release/boost/spirit.hpp                              |     4 ++++                                    
   branches/release/libs/spirit/classic/test/symbols_add_null.cpp |    11 ++++++++---                             
   branches/release/libs/spirit/test/Jamfile                      |     2 +-                                      
   branches/release/status/Jamfile.v2                             |     3 ++-                                     
   4 files changed, 15 insertions(+), 5 deletions(-)

Modified: branches/release/boost/spirit.hpp
==============================================================================
--- branches/release/boost/spirit.hpp	(original)
+++ branches/release/boost/spirit.hpp	2008-07-19 12:48:42 EDT (Sat, 19 Jul 2008)
@@ -9,11 +9,15 @@
 #ifndef BOOST_SPIRIT_DEPRECATED_INCLUDE_SPIRIT
 #define BOOST_SPIRIT_DEPRECATED_INCLUDE_SPIRIT
 
+#include <boost/version.hpp>
+
+#if BOOST_VERSION >= 103800
 #if defined(_MSC_VER) || defined(__BORLANDC__) || defined(__DMC__)
 #  pragma message ("Warning: This header is deprecated. Please use: boost/spirit/include/classic.hpp")
 #elif defined(__GNUC__) || defined(__HP_aCC) || defined(__SUNPRO_CC) || defined(__IBMCPP__)
 #  warning "This header is deprecated. Please use: boost/spirit/include/classic.hpp"
 #endif
+#endif
 
 #if !defined(BOOST_SPIRIT_USE_OLD_NAMESPACE)
 #define BOOST_SPIRIT_USE_OLD_NAMESPACE

Added: branches/release/boost/spirit/include/classic_spirit.hpp
==============================================================================
--- (empty file)
+++ branches/release/boost/spirit/include/classic_spirit.hpp	2008-07-19 12:48:42 EDT (Sat, 19 Jul 2008)
@@ -0,0 +1,13 @@
+/*=============================================================================
+  Copyright (c) 1998-2008 Joel de Guzman
+  Copyright (c) 2001-2008 Hartmut Kaiser
+
+  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)
+=============================================================================*/
+#if !defined(BOOST_SPIRIT_CLASSIC_APR_12_2008_0949AM)
+#define BOOST_SPIRIT_CLASSIC_APR_12_2008_0949AM
+
+#include <boost/spirit/home/classic.hpp>
+
+#endif // !defined(SPIRIT_CLASSIC_HPP)

Modified: branches/release/libs/spirit/classic/test/symbols_add_null.cpp
==============================================================================
--- branches/release/libs/spirit/classic/test/symbols_add_null.cpp	(original)
+++ branches/release/libs/spirit/classic/test/symbols_add_null.cpp	2008-07-19 12:48:42 EDT (Sat, 19 Jul 2008)
@@ -7,14 +7,19 @@
     http://www.boost.org/LICENSE_1_0.txt)
 =============================================================================*/
 
+#include <stdexcept>
+
 #define BOOST_SPIRIT_ASSERT_EXCEPTION ::spirit_exception
 
-struct spirit_exception
+struct spirit_exception : std::exception
 {
     spirit_exception(char const * msg)
         : message(msg)
     {
     }
+    ~spirit_exception() throw() {}
+
+    char const* what() const throw() { return message; }
 
     char const * message;
 };
@@ -51,7 +56,7 @@
         symbols_.add(begin, end, (void*) boost::addressof(symbols_));
         BOOST_TEST(0);
     }
-    catch (spirit_exception &e)
+    catch (spirit_exception &/*e*/)
     {
     }
 
@@ -61,7 +66,7 @@
         symbols_.add(begin2, end2, (void*) boost::addressof(symbols_));
         BOOST_TEST(0);
     }
-    catch (spirit_exception &e)
+    catch (spirit_exception &/*e*/)
     {
     }
     return boost::report_errors();

Modified: branches/release/libs/spirit/test/Jamfile
==============================================================================
--- branches/release/libs/spirit/test/Jamfile	(original)
+++ branches/release/libs/spirit/test/Jamfile	2008-07-19 12:48:42 EDT (Sat, 19 Jul 2008)
@@ -6,7 +6,7 @@
 #   License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
 #   http://www.boost.org/LICENSE_1_0.txt)
 #==============================================================================
-project spirit-tests
+project spirit_v2-tests
     : requirements <toolset>gcc:<cxxflags>-ftemplate-depth-300
     :
     :

Modified: branches/release/status/Jamfile.v2
==============================================================================
--- branches/release/status/Jamfile.v2	(original)
+++ branches/release/status/Jamfile.v2	2008-07-19 12:48:42 EDT (Sat, 19 Jul 2008)
@@ -78,7 +78,8 @@
 build-project ../libs/serialization/test ;     # test-suite serialization
 build-project ../libs/signals/test ;           # test-suite signals
 build-project ../libs/smart_ptr/test ;         # test-suite smart_ptr
-build-project ../libs/spirit/test ;            # test-suite spirit
+build-project ../libs/spirit/classic/test ;    # test-suite spirit classic
+build-project ../libs/spirit/test ;            # test-suite spirit v2
 build-project ../libs/statechart/test ;        # test-suite statechart
 build-project ../libs/static_assert ;          # test-suite static_assert
 build-project ../libs/system/test ;            # test-suite system