Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Deshim //folly:dynamic to //folly/json:dynamic in fbpcf #535

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Deshim //folly:dynamic to //folly/json:dynamic in fbpcf #535

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion example/billionaire_problem/main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
* LICENSE file in the root directory of this source tree.
*/

#include <folly/json.h>
#include <folly/json/json.h>

#include <gflags/gflags.h>
#include "fbpcf/scheduler/LazySchedulerFactory.h"
Expand Down
4 changes: 2 additions & 2 deletions example/edit_distance/EditDistanceCalculator_impl.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@

#pragma once

#include <folly/json.h>
#include <folly/json/json.h>
#include <stdexcept>
#include "./EditDistanceCalculator.h" // @manual
#include "folly/dynamic.h"
#include "folly/json/dynamic.h"
#include "folly/logging/xlog.h"

namespace fbpcf::edit_distance {
Expand Down
2 changes: 1 addition & 1 deletion example/edit_distance/EditDistanceResults.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion example/edit_distance/Validator.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
* LICENSE file in the root directory of this source tree.
*/

#include <folly/json.h>
#include <folly/json/json.h>
#include <folly/logging/xlog.h>
#include <math.h>
#include <sstream>
Expand Down
2 changes: 1 addition & 1 deletion example/edit_distance/test/EditDistanceAppTest.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

#include "../EditDistanceApp.h" // @manual
#include <folly/Format.h>
#include <folly/json.h>
#include <folly/json/json.h>
#include <gtest/gtest.h>
#include <fstream>
#include "../EditDistanceResults.h" // @manual
Expand Down
2 changes: 1 addition & 1 deletion example/edit_distance/test/EditDistanceCalculatorTest.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
*/

#include "../EditDistanceCalculator.h" // @manual
#include <folly/json.h>
#include <folly/json/json.h>
#include <gtest/gtest.h>
#include <memory>
#include "../EditDistanceInputReader.h" // @manual
Expand Down
2 changes: 1 addition & 1 deletion fbpcf/engine/communication/IPartyCommunicationAgentFactory.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
#pragma once
#include <memory>

#include <folly/dynamic.h>
#include <folly/json/dynamic.h>
#include "fbpcf/engine/communication/IPartyCommunicationAgent.h"
#include "fbpcf/util/MetricCollector.h"

Expand Down
2 changes: 1 addition & 1 deletion fbpcf/engine/communication/test/PartyCommunicationAgentTest.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
#include <thread>
#include <vector>

#include <folly/dynamic.h>
#include <folly/json/dynamic.h>
#include "fbpcf/engine/communication/InMemoryPartyCommunicationAgentFactory.h"
#include "fbpcf/engine/communication/InMemoryPartyCommunicationAgentHost.h"
#include "fbpcf/engine/communication/SocketPartyCommunicationAgentFactory.h"
Expand Down
2 changes: 1 addition & 1 deletion fbpcf/util/IMetricRecorder.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

#pragma once

#include <folly/dynamic.h>
#include <folly/json/dynamic.h>

namespace fbpcf::util {
/**
Expand Down
2 changes: 1 addition & 1 deletion fbpcf/util/MetricCollector.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

#pragma once

#include <folly/dynamic.h>
#include <folly/json/dynamic.h>
#include <folly/logging/xlog.h>
#include <string>
#include <unordered_map>
Expand Down
2 changes: 1 addition & 1 deletion fbpcf/util/test/MetricCollectorTest.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
*/

#include "fbpcf/util/MetricCollector.h"
#include <folly/dynamic.h>
#include <folly/json/dynamic.h>
#include <gtest/gtest.h>

namespace fbpcf::util {
Expand Down