diff --git a/datamgr_service/services/distributeddataservice/adapter/CMakeLists.txt b/datamgr_service/services/distributeddataservice/adapter/CMakeLists.txt index 7679854ed2db6e0b04b56a871c528392807b0369..0a5fc1d128f5d3467dace285daf9023a14ef3849 100644 --- a/datamgr_service/services/distributeddataservice/adapter/CMakeLists.txt +++ b/datamgr_service/services/distributeddataservice/adapter/CMakeLists.txt @@ -5,7 +5,7 @@ set(CMAKE_CXX_STANDARD 17) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++1y -fno-rtti -fvisibility=default -D_GNU_SOURCE") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fdata-sections -fPIC -fpic -ffunction-sections -D_GLIBC_MOCK") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wl,--no-as-needed -ldl") -set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wformat=0") +set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wformat=0 -fpermissive") #set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fprofile-generate -ftest-coverage") #set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fprofile-generate -ftest-coverage") set(MOCK_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../../../../mock") diff --git a/datamgr_service/services/distributeddataservice/app/CMakeLists.txt b/datamgr_service/services/distributeddataservice/app/CMakeLists.txt index 1b33b5d33da6a14e52fb58802e7766b8ea780e25..a0d1d80f4b1e08a8d1d9f3674db9782d5fd8e40c 100644 --- a/datamgr_service/services/distributeddataservice/app/CMakeLists.txt +++ b/datamgr_service/services/distributeddataservice/app/CMakeLists.txt @@ -3,7 +3,7 @@ project(app) set(CMAKE_CXX_STANDARD 17) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++1y -fno-rtti -fvisibility=default -D_GNU_SOURCE -pthread") -set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fdata-sections -fPIC -fpic -ffunction-sections -D_GLIBC_MOCK") +set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fdata-sections -fPIC -fpic -ffunction-sections -fpermissive -D_GLIBC_MOCK") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wl,--no-as-needed -ldl") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wformat=0") #set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fprofile-arcs -ftest-coverage") diff --git a/datamgr_service/services/distributeddataservice/framework/CMakeLists.txt b/datamgr_service/services/distributeddataservice/framework/CMakeLists.txt index a3677b4062e84f7bc584389c129df4c005c29828..4544e57a0dfd8baf5213282402ee1d10c7ac1968 100644 --- a/datamgr_service/services/distributeddataservice/framework/CMakeLists.txt +++ b/datamgr_service/services/distributeddataservice/framework/CMakeLists.txt @@ -5,7 +5,7 @@ set(CMAKE_CXX_STANDARD 17) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++1y -fno-rtti -fvisibility=default -D_GNU_SOURCE") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fdata-sections -fPIC -fpic -ffunction-sections -D_GLIBC_MOCK") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wl,--no-as-needed -ldl") -set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wformat=0") +set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wformat=0 -fpermissive") #set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fprofile-arcs -ftest-coverage") #set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fprofile-arcs -ftest-coverage") set(MOCK_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../../../../mock") diff --git a/datamgr_service/services/distributeddataservice/libs/distributeddb/common/src/json_object.cpp b/datamgr_service/services/distributeddataservice/libs/distributeddb/common/src/json_object.cpp index 807798a6a49d1a6a4540da8b66b340e6d59b0a52..284bb7781ad26e1b003432a051c8e1fe78fcdbfd 100644 --- a/datamgr_service/services/distributeddataservice/libs/distributeddb/common/src/json_object.cpp +++ b/datamgr_service/services/distributeddataservice/libs/distributeddb/common/src/json_object.cpp @@ -14,9 +14,13 @@ */ #include "json_object.h" + +#include #include +#include #include -#include +#include + #include "db_errno.h" #include "log_print.h" diff --git a/datamgr_service/services/distributeddataservice/libs/distributeddb/syncer/include/isyncer.h b/datamgr_service/services/distributeddataservice/libs/distributeddb/syncer/include/isyncer.h index 400ad99fdec4e40f88ab058d9aa5509f3949ad37..f4f04893f07af33b9b8d924daed69d53b8841541 100644 --- a/datamgr_service/services/distributeddataservice/libs/distributeddb/syncer/include/isyncer.h +++ b/datamgr_service/services/distributeddataservice/libs/distributeddb/syncer/include/isyncer.h @@ -20,6 +20,7 @@ #include #include #include +#include #include "distributeddb/result_set.h" #include "isync_interface.h" diff --git a/datamgr_service/services/distributeddataservice/service/CMakeLists.txt b/datamgr_service/services/distributeddataservice/service/CMakeLists.txt index c973b1d30e26387bf48fc7a5d04aa53c5f156a09..bf35ec486cfd2652087d19e95723c060e0fd9f42 100644 --- a/datamgr_service/services/distributeddataservice/service/CMakeLists.txt +++ b/datamgr_service/services/distributeddataservice/service/CMakeLists.txt @@ -5,7 +5,7 @@ set(CMAKE_CXX_STANDARD 17) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++1y -fno-rtti -fvisibility=hidden -D_GNU_SOURCE") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fdata-sections -fPIC -fpic -ffunction-sections -D_GLIBC_MOCK") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wl,--no-as-needed -ldl") -set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wformat=0") +set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wformat=0 -fpermissive") #set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fprofile-arcs -ftest-coverage") #set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fprofile-arcs -ftest-coverage") set(MOCK_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../../../../mock") diff --git a/relational_store/CMakeLists.txt b/relational_store/CMakeLists.txt index 1c9c702079668085bb93337072650c14ae901f8d..49323c455b92fc32291a9ea8f15c5224660892a2 100644 --- a/relational_store/CMakeLists.txt +++ b/relational_store/CMakeLists.txt @@ -5,7 +5,7 @@ set(CMAKE_CXX_STANDARD 17) set(CMAKE_CXX_FLAGS "-std=c++1y -fno-rtti -fvisibility=default -D_GNU_SOURCE") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fdata-sections -fPIC -fpic -ffunction-sections -D_GLIBC_MOCK") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wl,--no-as-needed -ldl") -set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wformat=0") +set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wformat=0 -fpermissive") set(MOCK_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../mock) add_definitions(-DNAPI_EXPERIMENTAL) diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index 94d87394c2cf49f72430f0987f2ec81b63b94e05..1d3c986d5ba2c43a53547308ee330ad4ef6d37e0 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -5,7 +5,7 @@ set(CMAKE_CXX_STANDARD 17) set(CMAKE_CXX_FLAGS "-std=c++1y -fno-rtti -fvisibility=default -D_GNU_SOURCE") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fdata-sections -fPIC -fpic -ffunction-sections -D_GLIBC_MOCK") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wl,--no-as-needed -ldl") -set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wformat=0") +set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wformat=0 -fpermissive") #set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fprofile-arcs -ftest-coverage") #set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fprofile-arcs -ftest-coverage")