diff --git a/ReactAndroid/src/main/jni/xreact/jni/CxxModuleWrapper.cpp b/ReactAndroid/src/main/jni/xreact/jni/CxxModuleWrapper.cpp index 839b0018fa..721649f0ba 100644 --- a/ReactAndroid/src/main/jni/xreact/jni/CxxModuleWrapper.cpp +++ b/ReactAndroid/src/main/jni/xreact/jni/CxxModuleWrapper.cpp @@ -16,7 +16,6 @@ #include #include -#include #include "ReadableNativeArray.h" @@ -207,7 +206,7 @@ std::string CxxModuleWrapper::getConstantsJson() { constsobject.insert(std::move(c.first), std::move(c.second)); } - return facebook::react::detail::toStdString(folly::toJson(constsobject)); + return folly::toJson(constsobject); } jobject CxxModuleWrapper::getMethods() { diff --git a/ReactAndroid/src/main/jni/xreact/jni/ProxyExecutor.cpp b/ReactAndroid/src/main/jni/xreact/jni/ProxyExecutor.cpp index f23b3f88f1..342ca47493 100644 --- a/ReactAndroid/src/main/jni/xreact/jni/ProxyExecutor.cpp +++ b/ReactAndroid/src/main/jni/xreact/jni/ProxyExecutor.cpp @@ -10,7 +10,6 @@ #include #include -#include namespace facebook { namespace react { @@ -57,7 +56,7 @@ ProxyExecutor::ProxyExecutor(jni::global_ref&& executorInstance, SystraceSection t("setGlobalVariable"); setGlobalVariable( "__fbBatchedBridgeConfig", - folly::make_unique(detail::toStdString(folly::toJson(config)))); + folly::make_unique(folly::toJson(config))); } ProxyExecutor::~ProxyExecutor() { diff --git a/ReactCommon/cxxreact/BUCK b/ReactCommon/cxxreact/BUCK index 19aaada220..36208bdcd2 100644 --- a/ReactCommon/cxxreact/BUCK +++ b/ReactCommon/cxxreact/BUCK @@ -71,7 +71,6 @@ cxx_library( compiler_flags = CXX_LIBRARY_COMPILER_FLAGS, exported_headers = [ 'CxxModule.h', - 'FollySupport.h', 'JsArgumentHelpers.h', 'JsArgumentHelpers-inl.h', ], diff --git a/ReactCommon/cxxreact/FollySupport.h b/ReactCommon/cxxreact/FollySupport.h deleted file mode 100644 index 7da9e36ada..0000000000 --- a/ReactCommon/cxxreact/FollySupport.h +++ /dev/null @@ -1,21 +0,0 @@ -// Copyright 2004-present Facebook. All Rights Reserved. - -#pragma once - -#include -#include - -namespace facebook { -namespace react { -namespace detail { -// TODO(cjhopman): Once folly is updated, remove these. - -inline std::string toStdString(std::string&& str) { - return std::move(str); -} - -inline std::string toStdString(folly::fbstring&& str) { - return str.toStdString(); -} - -}}} diff --git a/ReactCommon/cxxreact/JSCExecutor.cpp b/ReactCommon/cxxreact/JSCExecutor.cpp index d977a0ef3d..79df03c754 100644 --- a/ReactCommon/cxxreact/JSCExecutor.cpp +++ b/ReactCommon/cxxreact/JSCExecutor.cpp @@ -16,7 +16,6 @@ #include #include -#include "FollySupport.h" #include "JSCHelpers.h" #include "Platform.h" #include "SystraceSection.h" @@ -130,7 +129,7 @@ JSCExecutor::JSCExecutor(std::shared_ptr delegate, SystraceSection t("setGlobalVariable"); setGlobalVariable( "__fbBatchedBridgeConfig", - folly::make_unique(detail::toStdString(folly::toJson(config)))); + folly::make_unique(folly::toJson(config))); } JSCExecutor::JSCExecutor( diff --git a/ReactCommon/cxxreact/JsArgumentHelpers.h b/ReactCommon/cxxreact/JsArgumentHelpers.h index 5ad42eafc4..eec92bee7f 100644 --- a/ReactCommon/cxxreact/JsArgumentHelpers.h +++ b/ReactCommon/cxxreact/JsArgumentHelpers.h @@ -5,8 +5,6 @@ #include #include -#include "FollySupport.h" - #include #include @@ -100,7 +98,7 @@ inline double jsArgAsDouble(const folly::dynamic& args, size_t n) { // Extract the n'th arg from the given dynamic, as a string. Throws a // JsArgumentException if this fails for some reason. inline std::string jsArgAsString(const folly::dynamic& args, size_t n) { - return facebook::react::detail::toStdString(jsArgN(args, n, &folly::dynamic::asString)); + return jsArgN(args, n, &folly::dynamic::asString); } }}