Update of /cvsroot/boost/boost/tools/quickbook
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv26113/tools/quickbook

Modified Files:
        Jamfile.v2 phrase.hpp 
Log Message:
Implement template eval escape "[`xyz]".

Index: Jamfile.v2
===================================================================
RCS file: /cvsroot/boost/boost/tools/quickbook/Jamfile.v2,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- Jamfile.v2  9 Jun 2006 03:16:04 -0000       1.11
+++ Jamfile.v2  5 Jul 2007 01:56:15 -0000       1.12
@@ -20,6 +20,7 @@
     /boost//program_options
     /boost//filesystem
     : #<define>QUICKBOOK_NO_DATES
+      <toolset>msvc:<cxxflags>/wd4355
       <toolset>msvc:<cxxflags>/wd4511
       <toolset>msvc:<cxxflags>/wd4512
       <toolset>msvc:<cxxflags>/wd4701
@@ -27,6 +28,8 @@
       <toolset>msvc:<cxxflags>/wd4244
       <toolset>msvc:<cxxflags>/wd4267
       <toolset>msvc:<cxxflags>/wd4800
+      <toolset>msvc:<define>_CRT_SECURE_NO_DEPRECATE
+      <toolset>msvc:<define>_SCL_SECURE_NO_DEPRECATE
     ;
 
 install dist-bin

Index: phrase.hpp
===================================================================
RCS file: /cvsroot/boost/boost/tools/quickbook/phrase.hpp,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- phrase.hpp  27 Feb 2007 15:22:15 -0000      1.23
+++ phrase.hpp  5 Jul 2007 01:56:15 -0000       1.24
@@ -123,20 +123,28 @@
                         )
                     ;
 
+                static const bool true_ = true;
+                static const bool false_ = false;
+
                 template_ =
                     (
+                        ch_p('`')                       
[assign_a(actions.template_escape,true_)]
+                        |
+                        eps_p                           
[assign_a(actions.template_escape,false_)]
+                    )
+                    >>
+                    ( (
                         (eps_p(punct_p)
                             >> actions.templates.scope
                         )                               
[push_back_a(actions.template_info)]
                         >> !template_args
-                    )
-                |   (
+                    ) | (
                         (actions.templates.scope
                             >> eps_p
                         )                               
[push_back_a(actions.template_info)]
                         >> !(hard_space
                             >> template_args)
-                    )
+                    ) )
                     ;
 
                 brackets =


-------------------------------------------------------------------------
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
_______________________________________________
Boost-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/boost-cvs

Reply via email to