X-Git-Url: http://plrg.eecs.uci.edu/git/?a=blobdiff_plain;f=folly%2Ftest%2FSynchronizedTestLib.h;h=ed4868f8b3ce967915bedc73e0fa860082ad8cf4;hb=7bf1486094cccb266e789a378d8e5f91e3cb7780;hp=4313e6e46994bb7ec135f8dfc09ca3065cfae883;hpb=7c4e381ec6b27e098b1c69f659e10c9ac09c4126;p=folly.git

diff --git a/folly/test/SynchronizedTestLib.h b/folly/test/SynchronizedTestLib.h
index 4313e6e4..ed4868f8 100644
--- a/folly/test/SynchronizedTestLib.h
+++ b/folly/test/SynchronizedTestLib.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Facebook, Inc.
+ * Copyright 2012-present Facebook, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,8 +14,7 @@
  * limitations under the License.
  */
 
-#ifndef FOLLY_TEST_SYNCHRONIZEDTESTLIB_H
-#define FOLLY_TEST_SYNCHRONIZEDTESTLIB_H
+#pragma once
 
 // We have mutex types outside of folly that we want to test with Synchronized.
 // Make it easy for mutex implementators to test their classes with
@@ -29,23 +28,37 @@
 //
 // ... similar for testConcurrency, testDualLocking, etc.
 
-
-template <class Mutex> void testBasic();
-
-template <class Mutex> void testConcurrency();
-
-template <class Mutex> void testDualLocking();
-
-template <class Mutex> void testDualLockingWithConst();
-
-template <class Mutex> void testTimedSynchronized();
-
-template <class Mutex> void testTimedSynchronizedWithConst();
-
-template <class Mutex> void testConstCopy();
-
-template <class Mutex> void testInPlaceConstruction();
+namespace folly {
+namespace sync_tests {
+template <class Mutex>
+void testBasic();
+template <class Mutex>
+void testDeprecated();
+template <class Mutex>
+void testConcurrency();
+template <class Mutex>
+void testAcquireLocked();
+template <class Mutex>
+void testAcquireLockedWithConst();
+template <class Mutex>
+void testDualLockingWithConst();
+template <class Mutex>
+void testDualLocking();
+template <class Mutex>
+void testDualLockingWithConst();
+template <class Mutex>
+void testTimed();
+template <class Mutex>
+void testTimedShared();
+template <class Mutex>
+void testTimedSynchronizedDeprecated();
+template <class Mutex>
+void testTimedSynchronizedWithConst();
+template <class Mutex>
+void testConstCopy();
+template <class Mutex>
+void testInPlaceConstruction();
+} // namespace sync_tests
+} // namespace folly
 
 #include <folly/test/SynchronizedTestLib-inl.h>
-
-#endif /* FOLLY_TEST_SYNCHRONIZEDTESTLIB_H */