diff --git a/cpp/proto b/cpp/proto index 37be183be5f248ada04ba58ca72784e0fe1d63d3..e861100984116aacf6d84cb8a09dc0ef81041509 160000 --- a/cpp/proto +++ b/cpp/proto @@ -1 +1 @@ -Subproject commit 37be183be5f248ada04ba58ca72784e0fe1d63d3 +Subproject commit e861100984116aacf6d84cb8a09dc0ef81041509 diff --git a/cpp/src/CMakeLists.txt b/cpp/src/CMakeLists.txt index 750195c025156762b909964bde8e8795711a11c5..c986d16357924b039fc541d518c51c45906c7578 100644 --- a/cpp/src/CMakeLists.txt +++ b/cpp/src/CMakeLists.txt @@ -87,6 +87,6 @@ endif() # Generates the gRPC and Vereign services source code. add_custom_target( vcl-gen - COMMAND vcl-gen generate --templates-path=templates --output-path src + COMMAND vcl-gen generate -v --templates-path=templates --output-path src WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} ) diff --git a/cpp/tests/protobuf/json_test.cc b/cpp/tests/protobuf/json_test.cc index 45758d5727b0f22b89d375be7587dbf530ce2686..9fbc9988807257b0e8b1cbafdab696a4ed2f28ab 100644 --- a/cpp/tests/protobuf/json_test.cc +++ b/cpp/tests/protobuf/json_test.cc @@ -328,7 +328,7 @@ TEST_CASE("empty messages with OmitEmpty", "[protobuf]") { google::protobuf::util::JsonPrintOptions options; options.preserve_proto_field_names = true; - options.always_print_primitive_fields = true; + options.always_print_primitive_fields = false; std::string json; auto status = google::protobuf::util::MessageToJsonString(msg, &json, options);