[Boost-cvs] CVS: boost/tools/wave trace_macro_expansion.hpp, 1.23, 1.24

[Hartmut Kaiser]

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

Modified Files:
        trace_macro_expansion.hpp 
Log Message:
Wave: Changed return type of some preprocessing hooks to allow to skip the 
corresponding preprocessor action.

Index: trace_macro_expansion.hpp
===================================================================
RCS file: /cvsroot/boost/boost/tools/wave/trace_macro_expansion.hpp,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- trace_macro_expansion.hpp   26 Jun 2007 19:40:04 -0000      1.23
+++ trace_macro_expansion.hpp   4 Jul 2007 21:56:56 -0000       1.24
@@ -195,18 +195,22 @@
         TokenT const &macrodef, std::vector<TokenT> const &formal_args, 
         ContainerT const &definition,
         TokenT const &macrocall, std::vector<ContainerT> const &arguments) 
+    {
+        if (!enabled_macro_tracing()) 
+            return;
 #else
     // new signature
     template <typename ContextT, typename ContainerT, typename IteratorT>
-    void expanding_function_like_macro(ContextT const& ctx,
+    bool 
+    expanding_function_like_macro(ContextT const& ctx,
         TokenT const &macrodef, std::vector<TokenT> const &formal_args, 
         ContainerT const &definition,
         TokenT const &macrocall, std::vector<ContainerT> const &arguments,
         IteratorT const& seqstart, IteratorT const& seqend) 
-#endif
     {
-        if (!enabled_macro_tracing()) return;
-        
+        if (!enabled_macro_tracing()) 
+            return false;
+#endif
         if (0 == get_level()) {
         // output header line
         BOOST_WAVE_OSSTREAM stream;
@@ -278,6 +282,10 @@
             close_trace_body();
         }
         open_trace_body();
+        
+#if BOOST_WAVE_USE_DEPRECIATED_PREPROCESSING_HOOKS == 0
+        return false;
+#endif
     }
 
     ///////////////////////////////////////////////////////////////////////////
@@ -302,16 +310,20 @@
     template <typename ContainerT>
     void expanding_object_like_macro(TokenT const &macrodef, 
         ContainerT const &definition, TokenT const &macrocall)
+    {
+        if (!enabled_macro_tracing()) 
+            return;
 #else
     // new signature
     template <typename ContextT, typename ContainerT>
-    void expanding_object_like_macro(ContextT const& ctx,
+    bool 
+    expanding_object_like_macro(ContextT const& ctx,
         TokenT const &macrodef, ContainerT const &definition, 
         TokenT const &macrocall)
-#endif
     {
-        if (!enabled_macro_tracing()) return;
-        
+        if (!enabled_macro_tracing()) 
+            return false;
+#endif
         if (0 == get_level()) {
         // output header line
         BOOST_WAVE_OSSTREAM stream;
@@ -333,6 +345,10 @@
             output(BOOST_WAVE_GETSTRING(stream));
         }
         open_trace_body();
+
+#if BOOST_WAVE_USE_DEPRECIATED_PREPROCESSING_HOOKS == 0
+        return false;
+#endif
     }
     
     ///////////////////////////////////////////////////////////////////////////


-------------------------------------------------------------------------
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
Boost-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/boost-cvs