From 0cac5db5ccbaad8f9c7505053fd0b18e2aa69bdf Mon Sep 17 00:00:00 2001 From: Nicholas Ormrod Date: Wed, 13 Mar 2024 15:38:18 -0700 Subject: [PATCH] Deshim //folly:dynamic to //folly/json:dynamic in fbpcf Summary: The following headers were shimmed in //folly:dynamic and were modded: - folly/DynamicConverter.h -> folly/json/DynamicConverter.h - folly/dynamic.h -> folly/json/dynamic.h - folly/dynamic-inl.h -> folly/json/dynamic-inl.h - folly/json.h -> folly/json/json.h `arc lint` was applied Reviewed By: bcardosolopes Differential Revision: D53837058 --- example/billionaire_problem/main.cpp | 2 +- example/edit_distance/EditDistanceCalculator_impl.h | 4 ++-- example/edit_distance/EditDistanceResults.h | 2 +- example/edit_distance/Validator.cpp | 2 +- example/edit_distance/test/EditDistanceAppTest.cpp | 2 +- example/edit_distance/test/EditDistanceCalculatorTest.cpp | 2 +- fbpcf/engine/communication/IPartyCommunicationAgentFactory.h | 2 +- .../engine/communication/test/PartyCommunicationAgentTest.cpp | 2 +- fbpcf/util/IMetricRecorder.h | 2 +- fbpcf/util/MetricCollector.h | 2 +- fbpcf/util/test/MetricCollectorTest.cpp | 2 +- 11 files changed, 12 insertions(+), 12 deletions(-) diff --git a/example/billionaire_problem/main.cpp b/example/billionaire_problem/main.cpp index 1b3b9750..107969f6 100644 --- a/example/billionaire_problem/main.cpp +++ b/example/billionaire_problem/main.cpp @@ -5,7 +5,7 @@ * LICENSE file in the root directory of this source tree. */ -#include +#include #include #include "fbpcf/scheduler/LazySchedulerFactory.h" diff --git a/example/edit_distance/EditDistanceCalculator_impl.h b/example/edit_distance/EditDistanceCalculator_impl.h index 6cedde0b..22f8d812 100644 --- a/example/edit_distance/EditDistanceCalculator_impl.h +++ b/example/edit_distance/EditDistanceCalculator_impl.h @@ -7,10 +7,10 @@ #pragma once -#include +#include #include #include "./EditDistanceCalculator.h" // @manual -#include "folly/dynamic.h" +#include "folly/json/dynamic.h" #include "folly/logging/xlog.h" namespace fbpcf::edit_distance { diff --git a/example/edit_distance/EditDistanceResults.h b/example/edit_distance/EditDistanceResults.h index a20599fd..b3dacc4d 100644 --- a/example/edit_distance/EditDistanceResults.h +++ b/example/edit_distance/EditDistanceResults.h @@ -9,7 +9,7 @@ #include "./MPCTypes.h" // @manual #include "fbpcf/exception/exceptions.h" -#include "folly/dynamic.h" +#include "folly/json/dynamic.h" namespace fbpcf::edit_distance { struct EditDistanceResults { diff --git a/example/edit_distance/Validator.cpp b/example/edit_distance/Validator.cpp index e36989df..4b335fd8 100644 --- a/example/edit_distance/Validator.cpp +++ b/example/edit_distance/Validator.cpp @@ -5,7 +5,7 @@ * LICENSE file in the root directory of this source tree. */ -#include +#include #include #include #include diff --git a/example/edit_distance/test/EditDistanceAppTest.cpp b/example/edit_distance/test/EditDistanceAppTest.cpp index d693c8ef..32d385f8 100644 --- a/example/edit_distance/test/EditDistanceAppTest.cpp +++ b/example/edit_distance/test/EditDistanceAppTest.cpp @@ -7,7 +7,7 @@ #include "../EditDistanceApp.h" // @manual #include -#include +#include #include #include #include "../EditDistanceResults.h" // @manual diff --git a/example/edit_distance/test/EditDistanceCalculatorTest.cpp b/example/edit_distance/test/EditDistanceCalculatorTest.cpp index a2707ad4..34dbe1ce 100644 --- a/example/edit_distance/test/EditDistanceCalculatorTest.cpp +++ b/example/edit_distance/test/EditDistanceCalculatorTest.cpp @@ -6,7 +6,7 @@ */ #include "../EditDistanceCalculator.h" // @manual -#include +#include #include #include #include "../EditDistanceInputReader.h" // @manual diff --git a/fbpcf/engine/communication/IPartyCommunicationAgentFactory.h b/fbpcf/engine/communication/IPartyCommunicationAgentFactory.h index 89495b0a..0b64f839 100644 --- a/fbpcf/engine/communication/IPartyCommunicationAgentFactory.h +++ b/fbpcf/engine/communication/IPartyCommunicationAgentFactory.h @@ -8,7 +8,7 @@ #pragma once #include -#include +#include #include "fbpcf/engine/communication/IPartyCommunicationAgent.h" #include "fbpcf/util/MetricCollector.h" diff --git a/fbpcf/engine/communication/test/PartyCommunicationAgentTest.cpp b/fbpcf/engine/communication/test/PartyCommunicationAgentTest.cpp index ba703e8d..1825f6f3 100644 --- a/fbpcf/engine/communication/test/PartyCommunicationAgentTest.cpp +++ b/fbpcf/engine/communication/test/PartyCommunicationAgentTest.cpp @@ -18,7 +18,7 @@ #include #include -#include +#include #include "fbpcf/engine/communication/InMemoryPartyCommunicationAgentFactory.h" #include "fbpcf/engine/communication/InMemoryPartyCommunicationAgentHost.h" #include "fbpcf/engine/communication/SocketPartyCommunicationAgentFactory.h" diff --git a/fbpcf/util/IMetricRecorder.h b/fbpcf/util/IMetricRecorder.h index 09e4f875..acf59eab 100644 --- a/fbpcf/util/IMetricRecorder.h +++ b/fbpcf/util/IMetricRecorder.h @@ -7,7 +7,7 @@ #pragma once -#include +#include namespace fbpcf::util { /** diff --git a/fbpcf/util/MetricCollector.h b/fbpcf/util/MetricCollector.h index fce655d4..567f5294 100644 --- a/fbpcf/util/MetricCollector.h +++ b/fbpcf/util/MetricCollector.h @@ -7,7 +7,7 @@ #pragma once -#include +#include #include #include #include diff --git a/fbpcf/util/test/MetricCollectorTest.cpp b/fbpcf/util/test/MetricCollectorTest.cpp index 9c995f8f..695ce6a3 100644 --- a/fbpcf/util/test/MetricCollectorTest.cpp +++ b/fbpcf/util/test/MetricCollectorTest.cpp @@ -6,7 +6,7 @@ */ #include "fbpcf/util/MetricCollector.h" -#include +#include #include namespace fbpcf::util {