X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=ceph%2Fsrc%2Fboost%2Flibs%2Ftimer%2Fsrc%2Fcpu_timer.cpp;h=0802e9856090095fec5176a85a412d0bb37ed6b7;hb=b32b81446b3b05102be0267e79203f59329c1d97;hp=49a61746c07d6d125c002c5aaa37c8efaaad853b;hpb=215dd7151453fae88e6f968c975b6ce309d42dcf;p=ceph.git

diff --git a/ceph/src/boost/libs/timer/src/cpu_timer.cpp b/ceph/src/boost/libs/timer/src/cpu_timer.cpp
index 49a61746c..0802e9856 100644
--- a/ceph/src/boost/libs/timer/src/cpu_timer.cpp
+++ b/ceph/src/boost/libs/timer/src/cpu_timer.cpp
@@ -104,8 +104,8 @@ namespace
         tick_factor = -1;
       else
       {
-        assert(tick_factor <= 1000000000LL); // logic doesn't handle large ticks
-        tick_factor = 1000000000LL / tick_factor;  // compute factor
+        assert(tick_factor <= INT64_C(1000000000)); // logic doesn't handle large ticks
+        tick_factor = INT64_C(1000000000) / tick_factor;  // compute factor
         if (!tick_factor)
           tick_factor = -1;
       }
@@ -247,13 +247,17 @@ namespace boost
       if (!is_stopped())
       {
         stop();  // the sooner we stop(), the better
+#ifndef BOOST_NO_EXCEPTIONS
         try
         {
+#endif
           report();
+#ifndef BOOST_NO_EXCEPTIONS
         }
         catch (...) // eat any exceptions
         {
         }
+#endif
       }
     }