code reformatting #2

daedric · Feb 22, 2018 · d4cbbee · d4cbbee
1 parent 98f98c7
commit d4cbbee
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 5 deletions.
diff --git a/examples/metrics/main.cpp b/examples/metrics/main.cpp
@@ -9,14 +9,14 @@
  *
  */
 
+#include <commonpp/core/LoggingInterface.hpp>
 #include <commonpp/core/Utils.hpp>
 #include <commonpp/metric/Metrics.hpp>
 #include <commonpp/metric/reservoir/ExponentiallyDecaying.hpp>
 #include <commonpp/metric/sink/Console.hpp>
 #include <commonpp/metric/sink/Graphite.hpp>
 #include <commonpp/metric/sink/InfluxDB.hpp>
 #include <commonpp/metric/type/TimeScope.hpp>
-#include <commonpp/core/LoggingInterface.hpp>
 
 using commonpp::metric::MetricTag;
 using commonpp::metric::MetricValue;

diff --git a/include/commonpp/core/Options.hpp b/include/commonpp/core/Options.hpp
@@ -16,6 +16,7 @@
 #include <commonpp/core/Utils.hpp>
 #include <commonpp/core/config.hpp>
 
+// clang-format off
 #if BOOST_CLANG == 1 && BOOST_MAJOR == 1 && BOOST_MAJOR <= 55
 # if defined(BOOST_PP_VARIADICS)
 #  if !BOOST_PP_VARIADICS
@@ -27,6 +28,7 @@
 #  define BOOST_PP_VARIADICS 1
 # endif
 #endif
+// clang-format on
 
 #include <boost/preprocessor/seq/elem.hpp>
 #include <boost/preprocessor/seq/for_each.hpp>

diff --git a/include/commonpp/metric/type/Counter.hpp b/include/commonpp/metric/type/Counter.hpp
@@ -15,6 +15,7 @@
 #define SHARED_LOCK_USE_ATOMIC 2
 #define SHARED_LOCK_USE_SPINLOCK 3
 
+// clang-format off
 #ifndef SHARED_COUNTER_BACKEND
 # define SHARED_COUNTER_BACKEND SHARED_LOCK_USE_TBB
 #endif
@@ -31,6 +32,8 @@
 # include <atomic>
 #endif
 
+// clang-format on
+
 #include <commonpp/core/FloatingArithmeticTools.hpp>
 #include <commonpp/metric/MetricValue.hpp>
 #include <commonpp/metric/detail/types.hpp>

diff --git a/include/commonpp/thread/Spinlock.hpp b/include/commonpp/thread/Spinlock.hpp
@@ -16,6 +16,7 @@
 #define SPINLOCK_USE_ATOMIC 1
 #define SPINLOCK_USE_TBB 2
 
+// clang-format off
 #ifndef SPINLOCK_BACKEND
 # define SPINLOCK_BACKEND SPINLOCK_USE_TBB
 #endif
@@ -29,6 +30,7 @@
 #elif SPINLOCK_BACKEND == SPINLOCK_USE_TBB
 # include <tbb/spin_mutex.h>
 #endif
+// clang-format on
 
 namespace commonpp
 {
@@ -59,11 +61,11 @@ struct _spinlock
         while (!try_lock)
         {
 #if defined(__i386__) || defined(__x86_64__)
-# ifdef __clang__
+#ifdef __clang__
             _mm_pause();
-# else
+#else
             __builtin_ia32_pause();
-# endif
+#endif
 #endif
         }
     }

diff --git a/include/commonpp/thread/ThreadTimer.hpp b/include/commonpp/thread/ThreadTimer.hpp
@@ -13,7 +13,7 @@
 #include <commonpp/core/config.hpp>
 
 #if not defined(HAVE_POSIX_CPU_CLOCK)
-# error "Current platform cannot use the ThreadTimer"
+#error "Current platform cannot use the ThreadTimer"
 #endif
 
 #include <boost/timer/timer.hpp>

diff --git a/src/commonpp/thread/Thread.cpp b/src/commonpp/thread/Thread.cpp
@@ -12,6 +12,8 @@
 
 #include "commonpp/core/config.hpp"
 
+// clang-format off
+
 #if HAVE_HWLOC == 1
 # include "detail/Cores.hpp"
 #endif
@@ -28,6 +30,7 @@
 #ifndef HAVE_THREAD_LOCAL_SPECIFIER
 # include <boost/thread/tss.hpp>
 #endif
+// clang-format on
 
 #include "commonpp/core/LoggingInterface.hpp"
 #include "detail/logger.hpp"

diff --git a/src/commonpp/thread/ThreadPool.cpp b/src/commonpp/thread/ThreadPool.cpp
@@ -18,10 +18,12 @@
 #include "commonpp/core/config.hpp"
 #include "detail/logger.hpp"
 
+// clang-format off
 #if HAVE_HWLOC == 1
 # include <hwloc.h>
 # include "detail/Cores.hpp"
 #endif
+// clang-format on
 
 namespace commonpp
 {