Remove duplicated macros header
diff --git a/src/cycleclock.h b/src/cycleclock.h
index 1b7d4c9..be91700 100644
--- a/src/cycleclock.h
+++ b/src/cycleclock.h
@@ -39,15 +39,17 @@
#endif
#include <sys/time.h>
+#include "benchmark/macros.h"
+
+namespace benchmark {
// NOTE: only i386 and x86_64 have been well tested.
// PPC, sparc, alpha, and ia64 are based on
// http://peter.kuscsik.com/wordpress/?p=14
// with modifications by m3b. See also
// https://setisvn.ssl.berkeley.edu/svn/lib/fftw-3.0.1/kernel/cycle.h
-namespace benchmark {
namespace cycleclock {
// This should return the number of cycles since power-on. Thread-safe.
- static inline int64_t Now() {
+ inline ATTRIBUTE_ALWAYS_INLINE int64_t Now() {
#if defined(OS_MACOSX)
// this goes at the top because we need ALL Macs, regardless of
// architecture, to return the number of "mach time units" that
diff --git a/src/macros.h b/src/macros.h
deleted file mode 100644
index b470328..0000000
--- a/src/macros.h
+++ /dev/null
@@ -1,110 +0,0 @@
-#ifndef BENCHMARK_MACROS_H_
-#define BENCHMARK_MACROS_H_
-
-#include <assert.h>
-
-#define DISALLOW_COPY_AND_ASSIGN(TypeName) \
- TypeName(const TypeName&); \
- void operator=(const TypeName&);
-
-// The arraysize(arr) macro returns the # of elements in an array arr.
-// The expression is a compile-time constant, and therefore can be
-// used in defining new arrays, for example. If you use arraysize on
-// a pointer by mistake, you will get a compile-time error.
-//
-// One caveat is that, for C++03, arraysize() doesn't accept any array of
-// an anonymous type or a type defined inside a function. In these rare
-// cases, you have to use the unsafe ARRAYSIZE() macro below. This is
-// due to a limitation in C++03's template system. The limitation has
-// been removed in C++11.
-
-// This template function declaration is used in defining arraysize.
-// Note that the function doesn't need an implementation, as we only
-// use its type.
-template <typename T, size_t N>
-char (&ArraySizeHelper(T (&array)[N]))[N];
-
-// That gcc wants both of these prototypes seems mysterious. VC, for
-// its part, can't decide which to use (another mystery). Matching of
-// template overloads: the final frontier.
-#ifndef COMPILER_MSVC
-template <typename T, size_t N>
-char (&ArraySizeHelper(const T (&array)[N]))[N];
-#endif
-
-#define arraysize(array) (sizeof(ArraySizeHelper(array)))
-
-// The STATIC_ASSERT macro can be used to verify that a compile time
-// expression is true. For example, you could use it to verify the
-// size of a static array:
-//
-// STATIC_ASSERT(ARRAYSIZE(content_type_names) == CONTENT_NUM_TYPES,
-// content_type_names_incorrect_size);
-//
-// or to make sure a struct is smaller than a certain size:
-//
-// STATIC_ASSERT(sizeof(foo) < 128, foo_too_large);
-//
-// The second argument to the macro is the name of the variable. If
-// the expression is false, most compilers will issue a warning/error
-// containing the name of the variable.
-
-template <bool>
-struct StaticAssert {
-};
-
-#define STATIC_ASSERT(expr, msg) \
- typedef StaticAssert<(bool(expr))> msg[bool(expr) ? 1 : -1]
-
-// Implementation details of STATIC_ASSERT:
-//
-// - STATIC_ASSERT works by defining an array type that has -1
-// elements (and thus is invalid) when the expression is false.
-//
-// - The simpler definition
-//
-// #define STATIC_ASSERT(expr, msg) typedef char msg[(expr) ? 1 : -1]
-//
-// does not work, as gcc supports variable-length arrays whose sizes
-// are determined at run-time (this is gcc's extension and not part
-// of the C++ standard). As a result, gcc fails to reject the
-// following code with the simple definition:
-//
-// int foo;
-// STATIC_ASSERT(foo, msg); // not supposed to compile as foo is
-// // not a compile-time constant.
-//
-// - By using the type StaticAssert<(bool(expr))>, we ensures that
-// expr is a compile-time constant. (Template arguments must be
-// determined at compile-time.)
-//
-// - The outer parentheses in StaticAssert<(bool(expr))> are necessary
-// to work around a bug in gcc 3.4.4 and 4.0.1. If we had written
-//
-// StaticAssert<bool(expr)>
-//
-// instead, these compilers will refuse to compile
-//
-// STATIC_ASSERT(5 > 0, some_message);
-//
-// (They seem to think the ">" in "5 > 0" marks the end of the
-// template argument list.)
-//
-// - The array size is (bool(expr) ? 1 : -1), instead of simply
-//
-// ((expr) ? 1 : -1).
-//
-// This is to avoid running into a bug in MS VC 7.1, which
-// causes ((0.0) ? 1 : -1) to incorrectly evaluate to 1.
-
-#define CHECK(b) do { if (!(b)) assert(false); } while(0)
-#define CHECK_EQ(a, b) CHECK((a) == (b))
-#define CHECK_GE(a, b) CHECK((a) >= (b))
-#define CHECK_LE(a, b) CHECK((a) <= (b))
-#define CHECK_GT(a, b) CHECK((a) > (b))
-#define CHECK_LT(a, b) CHECK((a) < (b))
-
-
-#define ATTRIBUTE_UNUSED __attribute__ ((unused))
-
-#endif // BENCHMARK_MACROS_H_
diff --git a/src/sysinfo.cc b/src/sysinfo.cc
index b8dc3cb..8e32330 100644
--- a/src/sysinfo.cc
+++ b/src/sysinfo.cc
@@ -13,8 +13,8 @@
#include <iostream>
#include <limits>
+#include "benchmark/macros.h"
#include "cycleclock.h"
-#include "macros.h"
#include "mutex_lock.h"
#include "sleep.h"
diff --git a/src/walltime.cc b/src/walltime.cc
index 835b973..d0bec27 100644
--- a/src/walltime.cc
+++ b/src/walltime.cc
@@ -8,8 +8,8 @@
#include <atomic>
#include <limits>
+#include "benchmark/macros.h"
#include "cycleclock.h"
-#include "macros.h"
#include "sysinfo.h"
namespace benchmark {
