JSON fixed, too.

eclipse-ecal · Apr 16, 2024 · ff79d5c · ff79d5c
1 parent 2f67a1e
commit ff79d5c
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/contrib/ecalproto/src/ecal_proto_dyn.cpp b/contrib/ecalproto/src/ecal_proto_dyn.cpp
@@ -28,13 +28,13 @@
 #include <sstream>
 #include <fstream>
 
-#include "google/protobuf/port_def.inc"
+#include <google/protobuf/stubs/common.h>
 
 namespace eCAL
 {
 namespace protobuf
 {
-#if PROTOBUF_VERSION >= 5026000
+#if GOOGLE_PROTOBUF_VERSION >= 5026000
   class ParserErrorCollector : public google::protobuf::io::ErrorCollector
   {
   public:

diff --git a/ecal/core/src/pubsub/ecal_proto_dyn_json_sub.cpp b/ecal/core/src/pubsub/ecal_proto_dyn_json_sub.cpp
@@ -40,6 +40,7 @@
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wunused-parameter"
 #endif
+#include <google/protobuf/stubs/common.h>
 #include <google/protobuf/util/json_util.h>
 #include <google/protobuf/util/type_resolver_util.h>
 #include <google/protobuf/util/type_resolver.h>
@@ -158,7 +159,11 @@ namespace eCAL
         {
 
           google::protobuf::util::JsonOptions options;
-          options.always_print_primitive_fields = true;
+#if GOOGLE_PROTOBUF_VERSION >= 5026000
+        options.always_print_fields_with_no_presence = true;
+#else
+        options.always_print_primitive_fields = true;
+#endif
 
           std::string binary_input;
           binary_input.assign((char*)data_->buf, static_cast<size_t>(data_->size));