RequestContext support

[folly.git] / folly / Malloc.cpp

diff --git a/folly/Malloc.cpp b/folly/Malloc.cpp
index c19427fdbbaef612f120dc372f43291b0b19d8ce..42a9d329ee305c869cb6d7c240f2089f12c86945 100644 (file)
--- a/folly/Malloc.cpp
+++ b/folly/Malloc.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 Facebook, Inc.
+ * Copyright 2015 Facebook, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -37,7 +37,7 @@ bool usingJEMallocSlow() {
 
   // "volatile" because gcc optimizes out the reads from *counter, because
   // it "knows" malloc doesn't modify global state...
-  volatile uint64_t* counter;
+  /* nolint */ volatile uint64_t* counter;
   size_t counterLen = sizeof(uint64_t*);
 
   if (mallctl("thread.allocatedp", static_cast<void*>(&counter), &counterLen,
@@ -62,4 +62,3 @@ bool usingJEMallocSlow() {
 }
 
 }  // namespaces
-