FBString: remove unnecessary 7-byte padding in large strings

[folly.git] / folly / test / LifoSemTests.cpp

diff --git a/folly/test/LifoSemTests.cpp b/folly/test/LifoSemTests.cpp
index d06f2e0915a33a5dbc028622621d605084f8aef0..8861fedf8341db79f83746e4066f1fc9c79684a5 100644 (file)
--- a/folly/test/LifoSemTests.cpp
+++ b/folly/test/LifoSemTests.cpp
@@ -19,11 +19,11 @@
 #include <semaphore.h>
 #include <thread>
 
-#include <gtest/gtest.h>
-
 #include <folly/Benchmark.h>
 #include <folly/Random.h>
+#include <folly/portability/Asm.h>
 #include <folly/portability/GFlags.h>
+#include <folly/portability/GTest.h>
 #include <folly/test/DeterministicSchedule.h>
 
 using namespace folly;
@@ -196,7 +196,7 @@ TEST(LifoSem, shutdown_race) {
           a.wait();
           ++waitCount;
         }
-      } catch (ShutdownSemError& x) {
+      } catch (ShutdownSemError&) {
         // expected
         EXPECT_TRUE(a.isShutdown());
       }
@@ -228,7 +228,7 @@ TEST(LifoSem, shutdown_multi) {
         try {
           a.wait();
           EXPECT_TRUE(false);
-        } catch (ShutdownSemError& x) {
+        } catch (ShutdownSemError&) {
           // expected
           EXPECT_TRUE(a.isShutdown());
         }
@@ -319,7 +319,7 @@ BENCHMARK(single_thread_lifo_post, iters) {
   LifoSem sem;
   for (size_t n = 0; n < iters; ++n) {
     sem.post();
-    asm volatile ("":::"memory");
+    asm_volatile_memory();
   }
 }
 
@@ -327,7 +327,7 @@ BENCHMARK(single_thread_lifo_wait, iters) {
   LifoSem sem(iters);
   for (size_t n = 0; n < iters; ++n) {
     sem.wait();
-    asm volatile ("":::"memory");
+    asm_volatile_memory();
   }
 }
 
@@ -335,9 +335,9 @@ BENCHMARK(single_thread_lifo_postwait, iters) {
   LifoSem sem;
   for (size_t n = 0; n < iters; ++n) {
     sem.post();
-    asm volatile ("":::"memory");
+    asm_volatile_memory();
     sem.wait();
-    asm volatile ("":::"memory");
+    asm_volatile_memory();
   }
 }
 
@@ -345,7 +345,7 @@ BENCHMARK(single_thread_lifo_trywait, iters) {
   LifoSem sem;
   for (size_t n = 0; n < iters; ++n) {
     EXPECT_FALSE(sem.tryWait());
-    asm volatile ("":::"memory");
+    asm_volatile_memory();
   }
 }