Boost logo

Boost-Commit :

Subject: [Boost-commit] svn:boost r83345 - in trunk: boost/wave/util tools/wave
From: hartmut.kaiser_at_[hidden]
Date: 2013-03-07 08:34:57


Author: hkaiser
Date: 2013-03-07 08:34:56 EST (Thu, 07 Mar 2013)
New Revision: 83345
URL: http://svn.boost.org/trac/boost/changeset/83345

Log:
Fix #8255: Wave build warnings are probably errors on 64-bit
Text files modified:
   trunk/boost/wave/util/cpp_iterator.hpp | 2 +-
   trunk/boost/wave/util/cpp_macromap.hpp | 2 +-
   trunk/tools/wave/trace_macro_expansion.hpp | 2 +-
   3 files changed, 3 insertions(+), 3 deletions(-)

Modified: trunk/boost/wave/util/cpp_iterator.hpp
==============================================================================
--- trunk/boost/wave/util/cpp_iterator.hpp (original)
+++ trunk/boost/wave/util/cpp_iterator.hpp 2013-03-07 08:34:56 EST (Thu, 07 Mar 2013)
@@ -794,7 +794,7 @@
             char buffer[22];
 
                 using namespace std; // for some systems sprintf is in namespace std
- sprintf (buffer, "%d", pos.get_line());
+ sprintf (buffer, "%ld", pos.get_line());
 
                 pos.set_column(++column); // account for ' '
                 pending.push_back(result_type(T_INTLIT, buffer, pos));

Modified: trunk/boost/wave/util/cpp_macromap.hpp
==============================================================================
--- trunk/boost/wave/util/cpp_macromap.hpp (original)
+++ trunk/boost/wave/util/cpp_macromap.hpp 2013-03-07 08:34:56 EST (Thu, 07 Mar 2013)
@@ -1414,7 +1414,7 @@
     char buffer[22]; // 21 bytes holds all NUL-terminated unsigned 64-bit numbers
 
         using namespace std; // for some systems sprintf is in namespace std
- sprintf(buffer, "%d", main_pos.get_line());
+ sprintf(buffer, "%ld", main_pos.get_line());
         expanded.push_back(token_type(T_INTLIT, buffer, curr_token.get_position()));
         return true;
     }

Modified: trunk/tools/wave/trace_macro_expansion.hpp
==============================================================================
--- trunk/tools/wave/trace_macro_expansion.hpp (original)
+++ trunk/tools/wave/trace_macro_expansion.hpp 2013-03-07 08:34:56 EST (Thu, 07 Mar 2013)
@@ -621,7 +621,7 @@
     char buffer[22];
 
         using namespace std; // for some systems sprintf is in namespace std
- sprintf (buffer, "%d", pos.get_line());
+ sprintf (buffer, "%ld", pos.get_line());
 
         pos.set_column(++column); // account for ' '
         pending.push_back(result_type(T_INTLIT, buffer, pos));


Boost-Commit list run by bdawes at acm.org, david.abrahams at rcn.com, gregod at cs.rpi.edu, cpdaniel at pacbell.net, john at johnmaddock.co.uk