Fix Windows Engine Bot (flutter#6844)

Follow-up to flutter/engine#6833
hhjay · Nov 13, 2018 · 6a132f8 · 6a132f8
1 parent e6d6f18
commit 6a132f8
Show file tree

Hide file tree

Showing 2 changed files with 38 additions and 20 deletions.
diff --git a/fml/thread_local.cc b/fml/thread_local.cc
@@ -6,6 +6,8 @@
 
 namespace fml {
 
+#if FML_THREAD_LOCAL_PTHREADS
+
 ThreadLocal::ThreadLocal() : ThreadLocal(nullptr) {}
 
 ThreadLocal::ThreadLocal(ThreadLocalDestroyCallback destroy)
@@ -33,4 +35,35 @@ ThreadLocal::Box::Box(ThreadLocalDestroyCallback destroy, intptr_t value)
 
 ThreadLocal::Box::~Box() = default;
 
+#else  // FML_THREAD_LOCAL_PTHREADS
+
+ThreadLocal::ThreadLocal() : ThreadLocal(nullptr) {}
+
+ThreadLocal::ThreadLocal(ThreadLocalDestroyCallback destroy)
+    : destroy_(destroy), value_(0) {}
+
+void ThreadLocal::Set(intptr_t value) {
+  if (value_ == value) {
+    return;
+  }
+
+  if (value_ != 0 && destroy_) {
+    destroy_(value_);
+  }
+
+  value_ = value;
+}
+
+intptr_t ThreadLocal::Get() {
+  return value_;
+}
+
+ThreadLocal::~ThreadLocal() {
+  if (value_ != 0 && destroy_) {
+    destroy_(value_);
+  }
+}
+
+#endif  // FML_THREAD_LOCAL_PTHREADS
+
 }  // namespace fml
diff --git a/fml/thread_local.h b/fml/thread_local.h
@@ -101,30 +101,15 @@ class ThreadLocal {
 
 class ThreadLocal {
  public:
-  ThreadLocal() : ThreadLocal(nullptr) {}
-
-  ThreadLocal(ThreadLocalDestroyCallback destroy)
-      : destroy_(destroy), value_(0) {}
-
-  void Set(intptr_t value) {
-    if (value_ == value) {
-      return;
-    }
+  ThreadLocal();
 
-    if (value_ != 0 && destroy_) {
-      destroy_(value_);
-    }
+  ThreadLocal(ThreadLocalDestroyCallback destroy);
 
-    value_ = value;
-  }
+  void Set(intptr_t value);
 
-  intptr_t Get() { return value_; }
+  intptr_t Get();
 
-  ~ThreadLocal() {
-    if (value_ != 0 && destroy_) {
-      destroy_(value_);
-    }
-  }
+  ~ThreadLocal();
 
  private:
   ThreadLocalDestroyCallback destroy_;