From bafe4e56a742a9eff2778a037364d04de11e3591 Mon Sep 17 00:00:00 2001
From: Peter Johnson <johnson.peter@gmail.com>
Date: Sat, 21 Nov 2015 22:17:11 -0800
Subject: [PATCH] Notifier: Change back to constructor from ATOMIC_VAR_INIT.

Change-Id: Ia0addacee57f03e12f2ca12f7b5a1ba29d913ac4
---
 hal/lib/Athena/Notifier.cpp     | 2 +-
 wpilibc/Athena/src/Notifier.cpp | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/hal/lib/Athena/Notifier.cpp b/hal/lib/Athena/Notifier.cpp
index 8953c6c30c..c2c6c4c202 100644
--- a/hal/lib/Athena/Notifier.cpp
+++ b/hal/lib/Athena/Notifier.cpp
@@ -21,7 +21,7 @@ struct Notifier {
 };
 static Notifier *notifiers = nullptr;
 static std::atomic_flag notifierAtexitRegistered = ATOMIC_FLAG_INIT;
-static std::atomic_int notifierRefCount = ATOMIC_VAR_INIT(0);
+static std::atomic_int notifierRefCount{0};
 
 static void alarmCallback(uint32_t, void*)
 {
diff --git a/wpilibc/Athena/src/Notifier.cpp b/wpilibc/Athena/src/Notifier.cpp
index d70a2c869d..fc3059c41b 100644
--- a/wpilibc/Athena/src/Notifier.cpp
+++ b/wpilibc/Athena/src/Notifier.cpp
@@ -15,7 +15,7 @@ Notifier *Notifier::timerQueueHead = nullptr;
 priority_recursive_mutex Notifier::queueMutex;
 priority_mutex Notifier::halMutex;
 void *Notifier::m_notifier = nullptr;
-std::atomic<int> Notifier::refcount = ATOMIC_VAR_INIT(0);
+std::atomic<int> Notifier::refcount{0};
 
 /**
  * Create a Notifier for timer event notification.