From dbda1917cc10a2bb304bc65b3f54ac1c07243a30 Mon Sep 17 00:00:00 2001
From: Samuel Susla <samuelsusla@fb.com>
Date: Wed, 1 Sep 2021 11:17:41 -0700
Subject: [PATCH] Make RuntimeScheduler module compile in C++ 14

Summary:
changelog: [internal]

Don't use C++ 17 features in RuntimeScheduler module as it needs to be imported into C++14 module.

Also removes redundant dependency.

Reviewed By: ShikaSD

Differential Revision: D30485642

fbshipit-source-id: 0a20f85c596eebe193affc815c8ca851fc72e46d
---
 ReactCommon/react/renderer/runtimescheduler/BUCK           | 1 -
 .../react/renderer/runtimescheduler/RuntimeScheduler.cpp   | 6 ++++--
 .../react/renderer/runtimescheduler/RuntimeScheduler.h     | 6 ++++--
 .../renderer/runtimescheduler/RuntimeSchedulerBinding.cpp  | 7 ++++---
 .../renderer/runtimescheduler/RuntimeSchedulerBinding.h    | 6 ++++--
 .../renderer/runtimescheduler/RuntimeSchedulerClock.h      | 6 ++++--
 .../react/renderer/runtimescheduler/SchedulerPriority.h    | 7 ++++---
 ReactCommon/react/renderer/runtimescheduler/Task.cpp       | 6 ++++--
 ReactCommon/react/renderer/runtimescheduler/Task.h         | 6 ++++--
 ReactCommon/react/renderer/runtimescheduler/primitives.h   | 6 ++++--
 10 files changed, 36 insertions(+), 21 deletions(-)

diff --git a/ReactCommon/react/renderer/runtimescheduler/BUCK b/ReactCommon/react/renderer/runtimescheduler/BUCK
index 7cdf02a7637..83037289820 100644
--- a/ReactCommon/react/renderer/runtimescheduler/BUCK
+++ b/ReactCommon/react/renderer/runtimescheduler/BUCK
@@ -50,7 +50,6 @@ rn_xplat_cxx_library(
     tests = [":tests"],
     visibility = ["PUBLIC"],
     deps = [
-        react_native_xplat_target("react/renderer/core:core"),
         react_native_xplat_target("runtimeexecutor:runtimeexecutor"),
         react_native_xplat_target("react/renderer/debug:debug"),
         react_native_xplat_target("better:better"),
diff --git a/ReactCommon/react/renderer/runtimescheduler/RuntimeScheduler.cpp b/ReactCommon/react/renderer/runtimescheduler/RuntimeScheduler.cpp
index d1550bc85b1..fd47ab43033 100644
--- a/ReactCommon/react/renderer/runtimescheduler/RuntimeScheduler.cpp
+++ b/ReactCommon/react/renderer/runtimescheduler/RuntimeScheduler.cpp
@@ -7,7 +7,8 @@
 
 #include "RuntimeScheduler.h"
 
-namespace facebook::react {
+namespace facebook {
+namespace react {
 
 #pragma mark - Public
 
@@ -113,4 +114,5 @@ void RuntimeScheduler::startWorkLoop(jsi::Runtime &runtime) const {
   isPerformingWork_ = false;
 }
 
-} // namespace facebook::react
+} // namespace react
+} // namespace facebook
diff --git a/ReactCommon/react/renderer/runtimescheduler/RuntimeScheduler.h b/ReactCommon/react/renderer/runtimescheduler/RuntimeScheduler.h
index b5dad38ae2a..5d18a7d9ea8 100644
--- a/ReactCommon/react/renderer/runtimescheduler/RuntimeScheduler.h
+++ b/ReactCommon/react/renderer/runtimescheduler/RuntimeScheduler.h
@@ -14,7 +14,8 @@
 #include <memory>
 #include <queue>
 
-namespace facebook::react {
+namespace facebook {
+namespace react {
 
 class RuntimeScheduler final {
  public:
@@ -100,4 +101,5 @@ class RuntimeScheduler final {
   mutable bool isPerformingWork_{false};
 };
 
-} // namespace facebook::react
+} // namespace react
+} // namespace facebook
diff --git a/ReactCommon/react/renderer/runtimescheduler/RuntimeSchedulerBinding.cpp b/ReactCommon/react/renderer/runtimescheduler/RuntimeSchedulerBinding.cpp
index 05a3d3395a4..92525118e28 100644
--- a/ReactCommon/react/renderer/runtimescheduler/RuntimeSchedulerBinding.cpp
+++ b/ReactCommon/react/renderer/runtimescheduler/RuntimeSchedulerBinding.cpp
@@ -10,11 +10,11 @@
 #include "primitives.h"
 
 #include <react/debug/react_native_assert.h>
-#include <react/renderer/core/PropsParserContext.h>
 #include <chrono>
 #include <memory>
 
-namespace facebook::react {
+namespace facebook {
+namespace react {
 
 std::shared_ptr<RuntimeSchedulerBinding>
 RuntimeSchedulerBinding::createAndInstallIfNeeded(
@@ -167,4 +167,5 @@ jsi::Value RuntimeSchedulerBinding::get(
   return jsi::Value::undefined();
 }
 
-} // namespace facebook::react
+} // namespace react
+} // namespace facebook
diff --git a/ReactCommon/react/renderer/runtimescheduler/RuntimeSchedulerBinding.h b/ReactCommon/react/renderer/runtimescheduler/RuntimeSchedulerBinding.h
index cc4544d6a8f..27c1ad9f31d 100644
--- a/ReactCommon/react/renderer/runtimescheduler/RuntimeSchedulerBinding.h
+++ b/ReactCommon/react/renderer/runtimescheduler/RuntimeSchedulerBinding.h
@@ -10,7 +10,8 @@
 #include <jsi/jsi.h>
 #include <react/renderer/runtimescheduler/RuntimeScheduler.h>
 
-namespace facebook::react {
+namespace facebook {
+namespace react {
 
 /*
  * Exposes RuntimeScheduler to JavaScript realm.
@@ -39,4 +40,5 @@ class RuntimeSchedulerBinding : public jsi::HostObject {
   std::shared_ptr<RuntimeScheduler> runtimeScheduler_;
 };
 
-} // namespace facebook::react
+} // namespace react
+} // namespace facebook
diff --git a/ReactCommon/react/renderer/runtimescheduler/RuntimeSchedulerClock.h b/ReactCommon/react/renderer/runtimescheduler/RuntimeSchedulerClock.h
index 25e8b327db8..51652ee0a07 100644
--- a/ReactCommon/react/renderer/runtimescheduler/RuntimeSchedulerClock.h
+++ b/ReactCommon/react/renderer/runtimescheduler/RuntimeSchedulerClock.h
@@ -9,7 +9,8 @@
 
 #include <chrono>
 
-namespace facebook::react {
+namespace facebook {
+namespace react {
 
 /*
  * Represents a monotonic clock suitable for measuring intervals.
@@ -19,4 +20,5 @@ using RuntimeSchedulerClock = std::chrono::steady_clock;
 using RuntimeSchedulerTimePoint = RuntimeSchedulerClock::time_point;
 using RuntimeSchedulerDuration = RuntimeSchedulerClock::duration;
 
-} // namespace facebook::react
+} // namespace react
+} // namespace facebook
diff --git a/ReactCommon/react/renderer/runtimescheduler/SchedulerPriority.h b/ReactCommon/react/renderer/runtimescheduler/SchedulerPriority.h
index 4b5a1b7eab2..329fe252aa3 100644
--- a/ReactCommon/react/renderer/runtimescheduler/SchedulerPriority.h
+++ b/ReactCommon/react/renderer/runtimescheduler/SchedulerPriority.h
@@ -8,10 +8,10 @@
 #pragma once
 
 #include <react/debug/react_native_assert.h>
-#include <react/renderer/core/PropsParserContext.h>
 #include <chrono>
 
-namespace facebook::react {
+namespace facebook {
+namespace react {
 
 enum class SchedulerPriority : int {
   ImmediatePriority = 1,
@@ -61,4 +61,5 @@ static inline std::chrono::milliseconds timeoutForSchedulerPriority(
   }
 }
 
-} // namespace facebook::react
+} // namespace react
+} // namespace facebook
diff --git a/ReactCommon/react/renderer/runtimescheduler/Task.cpp b/ReactCommon/react/renderer/runtimescheduler/Task.cpp
index b44d9719a10..bd87944afa3 100644
--- a/ReactCommon/react/renderer/runtimescheduler/Task.cpp
+++ b/ReactCommon/react/renderer/runtimescheduler/Task.cpp
@@ -7,7 +7,8 @@
 
 #include "RuntimeScheduler.h"
 
-namespace facebook::react {
+namespace facebook {
+namespace react {
 
 Task::Task(
     SchedulerPriority priority,
@@ -32,4 +33,5 @@ jsi::Value Task::execute(jsi::Runtime &runtime) {
   return result;
 }
 
-} // namespace facebook::react
+} // namespace react
+} // namespace facebook
diff --git a/ReactCommon/react/renderer/runtimescheduler/Task.h b/ReactCommon/react/renderer/runtimescheduler/Task.h
index 74c387636e7..87676d5db73 100644
--- a/ReactCommon/react/renderer/runtimescheduler/Task.h
+++ b/ReactCommon/react/renderer/runtimescheduler/Task.h
@@ -12,7 +12,8 @@
 #include <react/renderer/runtimescheduler/RuntimeSchedulerClock.h>
 #include <react/renderer/runtimescheduler/SchedulerPriority.h>
 
-namespace facebook::react {
+namespace facebook {
+namespace react {
 
 class RuntimeScheduler;
 class TaskPriorityComparer;
@@ -43,4 +44,5 @@ class TaskPriorityComparer {
   }
 };
 
-} // namespace facebook::react
+} // namespace react
+} // namespace facebook
diff --git a/ReactCommon/react/renderer/runtimescheduler/primitives.h b/ReactCommon/react/renderer/runtimescheduler/primitives.h
index 76794941452..2283b4cad27 100644
--- a/ReactCommon/react/renderer/runtimescheduler/primitives.h
+++ b/ReactCommon/react/renderer/runtimescheduler/primitives.h
@@ -11,7 +11,8 @@
 #include <jsi/jsi.h>
 #include <react/renderer/runtimescheduler/Task.h>
 
-namespace facebook::react {
+namespace facebook {
+namespace react {
 
 struct TaskWrapper : public jsi::HostObject {
   TaskWrapper(std::shared_ptr<Task> const &task) : task(task) {}
@@ -36,4 +37,5 @@ inline static std::shared_ptr<Task> taskFromValue(
   return value.getObject(runtime).getHostObject<TaskWrapper>(runtime)->task;
 }
 
-} // namespace facebook::react
+} // namespace react
+} // namespace facebook