import quincy beta 17.1.0

[ceph.git] / ceph / src / boost / libs / wave / samples / token_statistics / collect_token_statistics.hpp

diff --git a/ceph/src/boost/libs/wave/samples/token_statistics/collect_token_statistics.hpp b/ceph/src/boost/libs/wave/samples/token_statistics/collect_token_statistics.hpp
index 815cf0e3e6108a4ea2dd5530206b4fb4a9eb3db0..aca26b87f84ea6520f5008dd1b76c65ef1f992dc 100644 (file)
--- a/ceph/src/boost/libs/wave/samples/token_statistics/collect_token_statistics.hpp
+++ b/ceph/src/boost/libs/wave/samples/token_statistics/collect_token_statistics.hpp
@@ -10,11 +10,12 @@
     LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 =============================================================================*/
 
-#if !defined(COLLECT_TOKEN_STATISTICS_VERSION_HPP)
-#define COLLECT_TOKEN_STATISTICS_VERSION_HPP
+#if !defined(BOOST_COLLECT_TOKEN_STATISTICS_VERSION_HPP)
+#define BOOST_COLLECT_TOKEN_STATISTICS_VERSION_HPP
 
 #include <algorithm>
 #include <map>
+#include <iostream>
 
 #include <boost/assert.hpp>
 #include <boost/wave/token_ids.hpp>
@@ -38,7 +39,7 @@ public:
     {
         using boost::wave::token_id;
         
-        int id = token_id(token) - boost::wave::T_FIRST_TOKEN;
+        int id = ID_FROM_TOKEN(token) - boost::wave::T_FIRST_TOKEN;
         BOOST_ASSERT(id < count);
         ++token_count[id];
     }
@@ -68,4 +69,4 @@ private:
     int token_count[count];
 };
 
-#endif // !defined(COLLECT_TOKEN_STATISTICS_VERSION_HPP)
+#endif // !defined(BOOST_COLLECT_TOKEN_STATISTICS_VERSION_HPP)