X-Git-Url: http://plrg.eecs.uci.edu/git/?p=folly.git;a=blobdiff_plain;f=folly%2Ftest%2FSingletonTestStructs.h;h=0d6472e7a83686be72ef2415a2ef3f2d2d584e8b;hp=cca975d1e5b56e96db6a440172fdb609553e72d7;hb=7fc3f9174951941df7a7a32acf320185716c26a6;hpb=8f1e662a59dec3476bf626b283effaa8a88acdd5

diff --git a/folly/test/SingletonTestStructs.h b/folly/test/SingletonTestStructs.h
index cca975d1..0d6472e7 100644
--- a/folly/test/SingletonTestStructs.h
+++ b/folly/test/SingletonTestStructs.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Facebook, Inc.
+ * Copyright 2017 Facebook, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,44 +15,22 @@
  */
 #pragma once
 
-/*
- * 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.
- * You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
 #include <memory>
+#include <stdexcept>
 #include <vector>
+
 #include <glog/logging.h>
-#include <gtest/gtest.h>
 
-// A simple class that tracks how often instances of the class and
-// subclasses are created, and the ordering.  Also tracks a global
-// unique counter for each object.
-std::atomic<size_t> global_counter(19770326);
+#include <folly/portability/GTest.h>
+
 struct Watchdog {
-  static std::vector<Watchdog*>& creation_order() {
-    static std::vector<Watchdog*> ret;
-    return ret;
-  }
+  static std::vector<Watchdog*>& creation_order();
 
-  Watchdog() : serial_number(++global_counter) {
-    creation_order().push_back(this);
-  }
+  Watchdog();
 
   ~Watchdog() {
     if (creation_order().back() != this) {
-      throw std::out_of_range("Watchdog destruction order mismatch");
+      LOG(FATAL) << "Watchdog destruction order mismatch";
     }
     creation_order().pop_back();
   }