[Boost-commit] svn:boost r68853 - in trunk/boost/spirit/home/karma: auxiliary binary char directive stream string

Subject: [Boost-commit] svn:boost r68853 - in trunk/boost/spirit/home/karma: auxiliary binary char directive stream string
From: hartmut.kaiser_at_[hidden]
Date: 2011-02-13 15:47:48

Author: hkaiser
Date: 2011-02-13 15:47:46 EST (Sun, 13 Feb 2011)
New Revision: 68853
URL: http://svn.boost.org/trac/boost/changeset/68853

Log:
Spirit: extending usage of BOOST_SPIRIT_NO_PREDEFINED_TERMINALS to all Karma components
Text files modified: 
   trunk/boost/spirit/home/karma/auxiliary/attr_cast.hpp        |     2 ++                                      
   trunk/boost/spirit/home/karma/auxiliary/eol.hpp              |     2 ++                                      
   trunk/boost/spirit/home/karma/auxiliary/eps.hpp              |     2 ++                                      
   trunk/boost/spirit/home/karma/binary/padding.hpp             |     2 ++                                      
   trunk/boost/spirit/home/karma/char/char.hpp                  |     2 ++                                      
   trunk/boost/spirit/home/karma/directive/as.hpp               |     4 +++-                                    
   trunk/boost/spirit/home/karma/directive/buffer.hpp           |     2 ++                                      
   trunk/boost/spirit/home/karma/directive/center_alignment.hpp |     2 ++                                      
   trunk/boost/spirit/home/karma/directive/columns.hpp          |     2 ++                                      
   trunk/boost/spirit/home/karma/directive/delimit.hpp          |     2 ++                                      
   trunk/boost/spirit/home/karma/directive/duplicate.hpp        |     2 ++                                      
   trunk/boost/spirit/home/karma/directive/left_alignment.hpp   |     2 ++                                      
   trunk/boost/spirit/home/karma/directive/maxwidth.hpp         |     2 ++                                      
   trunk/boost/spirit/home/karma/directive/no_delimit.hpp       |     2 ++                                      
   trunk/boost/spirit/home/karma/directive/omit.hpp             |     4 +++-                                    
   trunk/boost/spirit/home/karma/directive/repeat.hpp           |     4 +++-                                    
   trunk/boost/spirit/home/karma/directive/right_alignment.hpp  |     2 ++                                      
   trunk/boost/spirit/home/karma/directive/strict_relaxed.hpp   |     4 +++-                                    
   trunk/boost/spirit/home/karma/directive/verbatim.hpp         |     2 ++                                      
   trunk/boost/spirit/home/karma/stream/stream.hpp              |     4 ++++                                    
   trunk/boost/spirit/home/karma/string/lit.hpp                 |     2 ++                                      
   21 files changed, 48 insertions(+), 4 deletions(-)

Modified: trunk/boost/spirit/home/karma/auxiliary/attr_cast.hpp
==============================================================================
--- trunk/boost/spirit/home/karma/auxiliary/attr_cast.hpp	(original)
+++ trunk/boost/spirit/home/karma/auxiliary/attr_cast.hpp	2011-02-13 15:47:46 EST (Sun, 13 Feb 2011)
@@ -31,7 +31,9 @@
 
 namespace boost { namespace spirit { namespace karma
 {
+#ifndef BOOST_SPIRIT_NO_PREDEFINED_TERMINALS
     using spirit::attr_cast;
+#endif
 
     ///////////////////////////////////////////////////////////////////////////
     // attr_cast_generator consumes the attribute of subject generator without

Modified: trunk/boost/spirit/home/karma/auxiliary/eol.hpp
==============================================================================
--- trunk/boost/spirit/home/karma/auxiliary/eol.hpp	(original)
+++ trunk/boost/spirit/home/karma/auxiliary/eol.hpp	2011-02-13 15:47:46 EST (Sun, 13 Feb 2011)
@@ -33,7 +33,9 @@
 ///////////////////////////////////////////////////////////////////////////////
 namespace boost { namespace spirit { namespace karma
 {
+#ifndef BOOST_SPIRIT_NO_PREDEFINED_TERMINALS
     using boost::spirit::eol;
+#endif
     using boost::spirit::eol_type;
 
     struct eol_generator : primitive_generator<eol_generator>

Modified: trunk/boost/spirit/home/karma/auxiliary/eps.hpp
==============================================================================
--- trunk/boost/spirit/home/karma/auxiliary/eps.hpp	(original)
+++ trunk/boost/spirit/home/karma/auxiliary/eps.hpp	2011-02-13 15:47:46 EST (Sun, 13 Feb 2011)
@@ -45,7 +45,9 @@
 ///////////////////////////////////////////////////////////////////////////////
 namespace boost { namespace spirit { namespace karma
 {
+#ifndef BOOST_SPIRIT_NO_PREDEFINED_TERMINALS
     using boost::spirit::eps;
+#endif
     using boost::spirit::eps_type;
 
     struct eps_generator : primitive_generator<eps_generator>

Modified: trunk/boost/spirit/home/karma/binary/padding.hpp
==============================================================================
--- trunk/boost/spirit/home/karma/binary/padding.hpp	(original)
+++ trunk/boost/spirit/home/karma/binary/padding.hpp	2011-02-13 15:47:46 EST (Sun, 13 Feb 2011)
@@ -45,7 +45,9 @@
 ///////////////////////////////////////////////////////////////////////////////
 namespace boost { namespace spirit { namespace karma
 {
+#ifndef BOOST_SPIRIT_NO_PREDEFINED_TERMINALS
     using boost::spirit::pad;
+#endif
     using boost::spirit::pad_type;
 
     struct binary_padding_generator 

Modified: trunk/boost/spirit/home/karma/char/char.hpp
==============================================================================
--- trunk/boost/spirit/home/karma/char/char.hpp	(original)
+++ trunk/boost/spirit/home/karma/char/char.hpp	2011-02-13 15:47:46 EST (Sun, 13 Feb 2011)
@@ -94,7 +94,9 @@
 ///////////////////////////////////////////////////////////////////////////////
 namespace boost { namespace spirit { namespace karma
 {
+#ifndef BOOST_SPIRIT_NO_PREDEFINED_TERMINALS
     using spirit::lit;    // lit('x') is equivalent to 'x'
+#endif
     using spirit::lit_type;
 
     ///////////////////////////////////////////////////////////////////////////

Modified: trunk/boost/spirit/home/karma/directive/as.hpp
==============================================================================
--- trunk/boost/spirit/home/karma/directive/as.hpp	(original)
+++ trunk/boost/spirit/home/karma/directive/as.hpp	2011-02-13 15:47:46 EST (Sun, 13 Feb 2011)
@@ -62,9 +62,11 @@
 
 namespace boost { namespace spirit { namespace karma
 {
+#ifndef BOOST_SPIRIT_NO_PREDEFINED_TERMINALS
     using spirit::as_string;
-    using spirit::as_string_type;
     using spirit::as_wstring;
+#endif
+    using spirit::as_string_type;
     using spirit::as_wstring_type;
 
     ///////////////////////////////////////////////////////////////////////////

Modified: trunk/boost/spirit/home/karma/directive/buffer.hpp
==============================================================================
--- trunk/boost/spirit/home/karma/directive/buffer.hpp	(original)
+++ trunk/boost/spirit/home/karma/directive/buffer.hpp	2011-02-13 15:47:46 EST (Sun, 13 Feb 2011)
@@ -34,7 +34,9 @@
 
 namespace boost { namespace spirit { namespace karma
 {
+#ifndef BOOST_SPIRIT_NO_PREDEFINED_TERMINALS
     using spirit::buffer;
+#endif
     using spirit::buffer_type;
 
     ///////////////////////////////////////////////////////////////////////////

Modified: trunk/boost/spirit/home/karma/directive/center_alignment.hpp
==============================================================================
--- trunk/boost/spirit/home/karma/directive/center_alignment.hpp	(original)
+++ trunk/boost/spirit/home/karma/directive/center_alignment.hpp	2011-02-13 15:47:46 EST (Sun, 13 Feb 2011)
@@ -74,7 +74,9 @@
 ///////////////////////////////////////////////////////////////////////////////
 namespace boost { namespace spirit { namespace karma
 {
+#ifndef BOOST_SPIRIT_NO_PREDEFINED_TERMINALS
     using spirit::center;
+#endif
     using spirit::center_type;
 
     namespace detail

Modified: trunk/boost/spirit/home/karma/directive/columns.hpp
==============================================================================
--- trunk/boost/spirit/home/karma/directive/columns.hpp	(original)
+++ trunk/boost/spirit/home/karma/directive/columns.hpp	2011-02-13 15:47:46 EST (Sun, 13 Feb 2011)
@@ -62,7 +62,9 @@
 
 namespace boost { namespace spirit { namespace karma
 {
+#ifndef BOOST_SPIRIT_NO_PREDEFINED_TERMINALS
     using spirit::columns;
+#endif
     using spirit::columns_type;
 
     namespace detail

Modified: trunk/boost/spirit/home/karma/directive/delimit.hpp
==============================================================================
--- trunk/boost/spirit/home/karma/directive/delimit.hpp	(original)
+++ trunk/boost/spirit/home/karma/directive/delimit.hpp	2011-02-13 15:47:46 EST (Sun, 13 Feb 2011)
@@ -49,7 +49,9 @@
 
 namespace boost { namespace spirit { namespace karma
 {
+#ifndef BOOST_SPIRIT_NO_PREDEFINED_TERMINALS
     using spirit::delimit;
+#endif
     using spirit::delimit_type;
 
     ///////////////////////////////////////////////////////////////////////////

Modified: trunk/boost/spirit/home/karma/directive/duplicate.hpp
==============================================================================
--- trunk/boost/spirit/home/karma/directive/duplicate.hpp	(original)
+++ trunk/boost/spirit/home/karma/directive/duplicate.hpp	2011-02-13 15:47:46 EST (Sun, 13 Feb 2011)
@@ -38,7 +38,9 @@
 
 namespace boost { namespace spirit { namespace karma
 {
+#ifndef BOOST_SPIRIT_NO_PREDEFINED_TERMINALS
     using spirit::duplicate;
+#endif
     using spirit::duplicate_type;
 
     ///////////////////////////////////////////////////////////////////////////

Modified: trunk/boost/spirit/home/karma/directive/left_alignment.hpp
==============================================================================
--- trunk/boost/spirit/home/karma/directive/left_alignment.hpp	(original)
+++ trunk/boost/spirit/home/karma/directive/left_alignment.hpp	2011-02-13 15:47:46 EST (Sun, 13 Feb 2011)
@@ -74,7 +74,9 @@
 ///////////////////////////////////////////////////////////////////////////////
 namespace boost { namespace spirit { namespace karma
 {
+#ifndef BOOST_SPIRIT_NO_PREDEFINED_TERMINALS
     using spirit::left_align;
+#endif
     using spirit::left_align_type;
 
     namespace detail

Modified: trunk/boost/spirit/home/karma/directive/maxwidth.hpp
==============================================================================
--- trunk/boost/spirit/home/karma/directive/maxwidth.hpp	(original)
+++ trunk/boost/spirit/home/karma/directive/maxwidth.hpp	2011-02-13 15:47:46 EST (Sun, 13 Feb 2011)
@@ -72,7 +72,9 @@
 ///////////////////////////////////////////////////////////////////////////////
 namespace boost { namespace spirit { namespace karma
 {
+#ifndef BOOST_SPIRIT_NO_PREDEFINED_TERMINALS
     using spirit::maxwidth;
+#endif
     using spirit::maxwidth_type;
 
     namespace detail

Modified: trunk/boost/spirit/home/karma/directive/no_delimit.hpp
==============================================================================
--- trunk/boost/spirit/home/karma/directive/no_delimit.hpp	(original)
+++ trunk/boost/spirit/home/karma/directive/no_delimit.hpp	2011-02-13 15:47:46 EST (Sun, 13 Feb 2011)
@@ -35,7 +35,9 @@
 
 namespace boost { namespace spirit { namespace karma
 {
+#ifndef BOOST_SPIRIT_NO_PREDEFINED_TERMINALS
     using spirit::no_delimit;
+#endif
     using spirit::no_delimit_type;
 
     ///////////////////////////////////////////////////////////////////////////

Modified: trunk/boost/spirit/home/karma/directive/omit.hpp
==============================================================================
--- trunk/boost/spirit/home/karma/directive/omit.hpp	(original)
+++ trunk/boost/spirit/home/karma/directive/omit.hpp	2011-02-13 15:47:46 EST (Sun, 13 Feb 2011)
@@ -36,9 +36,11 @@
 
 namespace boost { namespace spirit { namespace karma
 {
+#ifndef BOOST_SPIRIT_NO_PREDEFINED_TERMINALS
     using spirit::omit;
-    using spirit::omit_type;
     using spirit::skip;
+#endif
+    using spirit::omit_type;
     using spirit::skip_type;
 
     ///////////////////////////////////////////////////////////////////////////

Modified: trunk/boost/spirit/home/karma/directive/repeat.hpp
==============================================================================
--- trunk/boost/spirit/home/karma/directive/repeat.hpp	(original)
+++ trunk/boost/spirit/home/karma/directive/repeat.hpp	2011-02-13 15:47:46 EST (Sun, 13 Feb 2011)
@@ -69,9 +69,11 @@
 
 namespace boost { namespace spirit { namespace karma
 {
+#ifndef BOOST_SPIRIT_NO_PREDEFINED_TERMINALS
     using spirit::repeat;
-    using spirit::repeat_type;
     using spirit::inf;
+#endif
+    using spirit::repeat_type;
     using spirit::inf_type;
 
     ///////////////////////////////////////////////////////////////////////////

Modified: trunk/boost/spirit/home/karma/directive/right_alignment.hpp
==============================================================================
--- trunk/boost/spirit/home/karma/directive/right_alignment.hpp	(original)
+++ trunk/boost/spirit/home/karma/directive/right_alignment.hpp	2011-02-13 15:47:46 EST (Sun, 13 Feb 2011)
@@ -74,7 +74,9 @@
 ///////////////////////////////////////////////////////////////////////////////
 namespace boost { namespace spirit { namespace karma
 {
+#ifndef BOOST_SPIRIT_NO_PREDEFINED_TERMINALS
     using spirit::right_align;
+#endif
     using spirit::right_align_type;
 
     namespace detail

Modified: trunk/boost/spirit/home/karma/directive/strict_relaxed.hpp
==============================================================================
--- trunk/boost/spirit/home/karma/directive/strict_relaxed.hpp	(original)
+++ trunk/boost/spirit/home/karma/directive/strict_relaxed.hpp	2011-02-13 15:47:46 EST (Sun, 13 Feb 2011)
@@ -66,9 +66,11 @@
 
     namespace karma
     {
+#ifndef BOOST_SPIRIT_NO_PREDEFINED_TERMINALS
         using boost::spirit::strict;
-        using boost::spirit::strict_type;
         using boost::spirit::relaxed;
+#endif
+        using boost::spirit::strict_type;
         using boost::spirit::relaxed_type;
     }
 }}

Modified: trunk/boost/spirit/home/karma/directive/verbatim.hpp
==============================================================================
--- trunk/boost/spirit/home/karma/directive/verbatim.hpp	(original)
+++ trunk/boost/spirit/home/karma/directive/verbatim.hpp	2011-02-13 15:47:46 EST (Sun, 13 Feb 2011)
@@ -36,7 +36,9 @@
 
 namespace boost { namespace spirit { namespace karma
 {
+#ifndef BOOST_SPIRIT_NO_PREDEFINED_TERMINALS
     using spirit::verbatim;
+#endif
     using spirit::verbatim_type;
 
     ///////////////////////////////////////////////////////////////////////////

Modified: trunk/boost/spirit/home/karma/stream/stream.hpp
==============================================================================
--- trunk/boost/spirit/home/karma/stream/stream.hpp	(original)
+++ trunk/boost/spirit/home/karma/stream/stream.hpp	2011-02-13 15:47:46 EST (Sun, 13 Feb 2011)
@@ -102,8 +102,12 @@
 ///////////////////////////////////////////////////////////////////////////////
 namespace boost { namespace spirit { namespace karma
 {
+#ifndef BOOST_SPIRIT_NO_PREDEFINED_TERMINALS
     using spirit::stream;
     using spirit::wstream;
+#endif
+    using spirit::stream_type;
+    using spirit::wstream_type;
 
     ///////////////////////////////////////////////////////////////////////////
     template <typename Char, typename CharEncoding, typename Tag>

Modified: trunk/boost/spirit/home/karma/string/lit.hpp
==============================================================================
--- trunk/boost/spirit/home/karma/string/lit.hpp	(original)
+++ trunk/boost/spirit/home/karma/string/lit.hpp	2011-02-13 15:47:46 EST (Sun, 13 Feb 2011)
@@ -78,7 +78,9 @@
 ///////////////////////////////////////////////////////////////////////////////
 namespace boost { namespace spirit { namespace karma
 {
+#ifndef BOOST_SPIRIT_NO_PREDEFINED_TERMINALS
     using spirit::lit;
+#endif
     using spirit::lit_type;
 
     ///////////////////////////////////////////////////////////////////////////