Remove unnecessary volatile.

2 files changed, 2 insertions, 5 deletions

diff --git a/vespamalloc/src/vespamalloc/malloc/threadproxy.cpp b/vespamalloc/src/vespamalloc/malloc/threadproxy.cpp
index d5cb88ba0ea..7a071e87d41 100644
--- a/vespamalloc/src/vespamalloc/malloc/threadproxy.cpp
+++ b/vespamalloc/src/vespamalloc/malloc/threadproxy.cpp
@@ -1,9 +1,7 @@
 // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+
 #include "threadproxy.h"
 #include <dlfcn.h>
-#include <stdio.h>
-#include <errno.h>
-#include <pthread.h>
 
 namespace vespamalloc {
 
@@ -34,7 +32,7 @@ typedef int (*pthread_create_function) (pthread_t *thread,
 int linuxthreads_pthread_getattr_np(pthread_t pid, pthread_attr_t *dst);
 
 static void * _G_mallocThreadProxyReturnAddress = NULL;
-static volatile std::atomic<size_t> _G_threadCount(1);  // You always have the main thread.
+static std::atomic<size_t> _G_threadCount(1);  // You always have the main thread.
 
 static void cleanupThread(void * arg)
 {
diff --git a/vespamalloc/src/vespamalloc/util/index.h b/vespamalloc/src/vespamalloc/util/index.h
index 3bfa4fbe7e5..b2c20f7bf02 100644
--- a/vespamalloc/src/vespamalloc/util/index.h
+++ b/vespamalloc/src/vespamalloc/util/index.h
@@ -20,4 +20,3 @@ private:
 };
 
 }
-