summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYevhenii Dementieiev (GitHub) <ydementieiev@luxoft.com>2020-01-30 12:52:44 +0200
committerYevhenii Dementieiev (GitHub) <ydementieiev@luxoft.com>2020-01-30 12:52:44 +0200
commitbc7ce62d0d2f3880b3976bf05c55437e9511b728 (patch)
tree84a9928274458a38c741c37bf8db36de1251768e
parentfe71aef64d7c9e1e35a614721acda513bb785c2a (diff)
downloadsdl_core-fix/build_with_external_after_new_jsoncpp.tar.gz
Fix build witj external proprietary after update new jsoncpp libfix/build_with_external_after_new_jsoncpp
-rw-r--r--src/components/policy/policy_external/src/cache_manager.cc1
-rw-r--r--src/components/policy/policy_external/test/policy_manager_impl_ptu_test.cc4
-rw-r--r--src/components/policy/policy_external/test/policy_manager_impl_test_base.cc4
3 files changed, 4 insertions, 5 deletions
diff --git a/src/components/policy/policy_external/src/cache_manager.cc b/src/components/policy/policy_external/src/cache_manager.cc
index 4cb052ebcd..5bf4bfd658 100644
--- a/src/components/policy/policy_external/src/cache_manager.cc
+++ b/src/components/policy/policy_external/src/cache_manager.cc
@@ -41,7 +41,6 @@
#include <utility>
#include <vector>
-#include "json/features.h"
#include "json/writer.h"
#include "policy/policy_helper.h"
#include "policy/policy_table/enums.h"
diff --git a/src/components/policy/policy_external/test/policy_manager_impl_ptu_test.cc b/src/components/policy/policy_external/test/policy_manager_impl_ptu_test.cc
index 2361717d9a..4fbbeaa6aa 100644
--- a/src/components/policy/policy_external/test/policy_manager_impl_ptu_test.cc
+++ b/src/components/policy/policy_external/test/policy_manager_impl_ptu_test.cc
@@ -806,7 +806,7 @@ TEST_F(PolicyManagerImplTest2,
std::string json;
Json::Value root(Json::objectValue);
if (ifile.is_open()) {
- Json::parseFromStream(reader_builder, ifile, &root, nullptr)
+ Json::parseFromStream(reader_builder, ifile, &root, nullptr);
}
json = root.toStyledString();
ifile.close();
@@ -908,7 +908,7 @@ TEST_F(PolicyManagerImplTest2,
std::string json;
Json::Value root(Json::objectValue);
if (ifile.is_open()) {
- Json::parseFromStream(reader_builder, ifile, &root, nullptr)
+ Json::parseFromStream(reader_builder, ifile, &root, nullptr);
}
json = root.toStyledString();
ifile.close();
diff --git a/src/components/policy/policy_external/test/policy_manager_impl_test_base.cc b/src/components/policy/policy_external/test/policy_manager_impl_test_base.cc
index 8c28d11a9f..9f363a223a 100644
--- a/src/components/policy/policy_external/test/policy_manager_impl_test_base.cc
+++ b/src/components/policy/policy_external/test/policy_manager_impl_test_base.cc
@@ -476,7 +476,7 @@ void PolicyManagerImplTest2::
std::string json;
Json::Value root(Json::objectValue);
if (ifile.is_open()) {
- Json::parseFromStream(reader_builder, ifile, &root, nullptr)
+ Json::parseFromStream(reader_builder, ifile, &root, nullptr);
}
json = root.toStyledString();
ifile.close();
@@ -626,7 +626,7 @@ void PolicyManagerImplTest2::LoadPTUFromJsonFile(
std::string json;
Json::Value root(Json::objectValue);
if (ifile.is_open()) {
- Json::parseFromStream(reader_builder, ifile, &root, nullptr)
+ Json::parseFromStream(reader_builder, ifile, &root, nullptr);
}
json = root.toStyledString();
ifile.close();