1 files changed, 16 insertions, 0 deletions
diff --git a/src/boost/libs/timer/test/chrono_conflict_test.cpp b/src/boost/libs/timer/test/chrono_conflict_test.cpp
new file mode 100644
index 00000000..8d5386b8
--- /dev/null
+++ b/src/boost/libs/timer/test/chrono_conflict_test.cpp
@@ -0,0 +1,16 @@
+// Copyright 2017 Peter Dimov.
+//
+// Distributed under the Boost Software License, Version 1.0.
+//
+// Check that using Chrono and Timer in the same program does
+//   not cause link errors.
+
+
+#include <boost/chrono.hpp>
+#include <boost/timer/timer.hpp>
+
+int main()
+{
+    boost::chrono::steady_clock::now();
+    boost::timer::cpu_timer cpt;
+}