commit 84cd50b85e2c7ff384a362933446691d3c3be357
author Billy O'Neal <billy.oneal@gmail.com> Tue May 31 16:54:02 2016 -0700
committer Dominic Hamon <dominichamon@users.noreply.github.com> Tue May 31 16:54:02 2016 -0700
tree 4812227bbd904323d106cfbaf9ea0d78e2bc5bcd
parent 3685cad68c5180e0da2afb7c05bd03422c0fe454

Add workaround for VS2013 const-incorrect atomic (#230)

src/benchmark.cc

diff --git a/src/benchmark.cc b/src/benchmark.cc
index d86705e..599cda0 100644
--- a/src/benchmark.cc
+++ b/src/benchmark.cc
@@ -115,7 +115,13 @@
 
 // Global variable so that a benchmark can report an error as a human readable
 // string. If error_message is null no error occurred.
-static std::atomic<const char*> error_message = ATOMIC_VAR_INIT(nullptr);
+#if defined(_MSC_VER) && _MSC_VER <= 1800
+typedef char* error_message_type;
+#else
+typedef const char* error_message_type;
+#endif
+
+static std::atomic<error_message_type> error_message = ATOMIC_VAR_INIT(nullptr);
 
 // TODO(ericwf): support MallocCounter.
 //static benchmark::MallocCounter *benchmark_mc;
@@ -807,7 +813,7 @@
         MutexLock l(GetBenchmarkLock());
         label = *GetReportLabel();
       }
-      const char* error_msg = error_message;
+      error_message_type error_msg = error_message;
 
       const double min_time = !IsZero(b.min_time) ? b.min_time
                                                   : FLAGS_benchmark_min_time;
@@ -929,8 +935,9 @@
 void State::SkipWithError(const char* msg) {
   CHECK(msg);
   error_occurred_ = true;
-  const char* expected_no_error_msg = nullptr;
-  error_message.compare_exchange_weak(expected_no_error_msg, msg);
+  error_message_type expected_no_error_msg = nullptr;
+  error_message.compare_exchange_weak(expected_no_error_msg,
+    const_cast<error_message_type>(msg));
   started_ = finished_ = true;
   total_iterations_ = max_iterations;
   timer_manager->RemoveErroredThread();