vSomeIP 2.2.42.2.4

8 files changed, 32 insertions, 10 deletions

diff --git a/implementation/message/include/deserializer.hpp b/implementation/message/include/deserializer.hpp
index 941358b..0588aa7 100644
--- a/implementation/message/include/deserializer.hpp
+++ b/implementation/message/include/deserializer.hpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2014-2015 Bayerische Motoren Werke Aktiengesellschaft (BMW AG)

+// Copyright (C) 2014-2016 Bayerische Motoren Werke Aktiengesellschaft (BMW AG)

 // This Source Code Form is subject to the terms of the Mozilla Public

 // License, v. 2.0. If a copy of the MPL was not distributed with this

 // file, You can obtain one at http://mozilla.org/MPL/2.0/.

diff --git a/implementation/message/include/message_base_impl.hpp b/implementation/message/include/message_base_impl.hpp
index 58562f1..40486a2 100644
--- a/implementation/message/include/message_base_impl.hpp
+++ b/implementation/message/include/message_base_impl.hpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2014-2015 Bayerische Motoren Werke Aktiengesellschaft (BMW AG)

+// Copyright (C) 2014-2016 Bayerische Motoren Werke Aktiengesellschaft (BMW AG)

 // This Source Code Form is subject to the terms of the Mozilla Public

 // License, v. 2.0. If a copy of the MPL was not distributed with this

 // file, You can obtain one at http://mozilla.org/MPL/2.0/.

@@ -56,12 +56,16 @@ public:
     VSOMEIP_EXPORT bool is_reliable() const;

     VSOMEIP_EXPORT void set_reliable(bool _is_reliable);

 

+    VSOMEIP_EXPORT virtual bool is_initial() const;

+    VSOMEIP_EXPORT virtual void set_initial(bool _is_initial);

+

     VSOMEIP_EXPORT message * get_owner() const;

     VSOMEIP_EXPORT void set_owner(message *_owner);

 

 protected: // members

     message_header_impl header_;

     bool is_reliable_;

+    bool is_initial_;

 };

 

 } // namespace vsomeip

diff --git a/implementation/message/include/message_header_impl.hpp b/implementation/message/include/message_header_impl.hpp
index b233d75..18f734d 100644
--- a/implementation/message/include/message_header_impl.hpp
+++ b/implementation/message/include/message_header_impl.hpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2014-2015 Bayerische Motoren Werke Aktiengesellschaft (BMW AG)

+// Copyright (C) 2014-2016 Bayerische Motoren Werke Aktiengesellschaft (BMW AG)

 // This Source Code Form is subject to the terms of the Mozilla Public

 // License, v. 2.0. If a copy of the MPL was not distributed with this

 // file, You can obtain one at http://mozilla.org/MPL/2.0/.

diff --git a/implementation/message/include/message_impl.hpp b/implementation/message/include/message_impl.hpp
index 7c8902c..102833a 100644
--- a/implementation/message/include/message_impl.hpp
+++ b/implementation/message/include/message_impl.hpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2014-2015 Bayerische Motoren Werke Aktiengesellschaft (BMW AG)

+// Copyright (C) 2014-2016 Bayerische Motoren Werke Aktiengesellschaft (BMW AG)

 // This Source Code Form is subject to the terms of the Mozilla Public

 // License, v. 2.0. If a copy of the MPL was not distributed with this

 // file, You can obtain one at http://mozilla.org/MPL/2.0/.

@@ -11,6 +11,16 @@
 #include <vsomeip/export.hpp>

 #include "message_base_impl.hpp"

 

+#  if _MSC_VER >= 1300

+/*

+* Diamond inheritance is used for the vsomeip::message_base base class.

+* The Microsoft compiler put warning (C4250) using a desired c++ feature: "Delegating to a sister class"

+* A powerful technique that arises from using virtual inheritance is to delegate a method from a class in another class

+* by using a common abstract base class. This is also called cross delegation.

+*/

+#    pragma warning( disable : 4250 )

+#  endif

+

 namespace vsomeip {

 

 class payload;

diff --git a/implementation/message/include/payload_impl.hpp b/implementation/message/include/payload_impl.hpp
index 2530ac8..66b3afa 100644
--- a/implementation/message/include/payload_impl.hpp
+++ b/implementation/message/include/payload_impl.hpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2014-2015 Bayerische Motoren Werke Aktiengesellschaft (BMW AG)

+// Copyright (C) 2014-2016 Bayerische Motoren Werke Aktiengesellschaft (BMW AG)

 // This Source Code Form is subject to the terms of the Mozilla Public

 // License, v. 2.0. If a copy of the MPL was not distributed with this

 // file, You can obtain one at http://mozilla.org/MPL/2.0/.

diff --git a/implementation/message/include/serializer.hpp b/implementation/message/include/serializer.hpp
index 427ee20..7928a52 100644
--- a/implementation/message/include/serializer.hpp
+++ b/implementation/message/include/serializer.hpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2014-2015 Bayerische Motoren Werke Aktiengesellschaft (BMW AG)

+// Copyright (C) 2014-2016 Bayerische Motoren Werke Aktiengesellschaft (BMW AG)

 // This Source Code Form is subject to the terms of the Mozilla Public

 // License, v. 2.0. If a copy of the MPL was not distributed with this

 // file, You can obtain one at http://mozilla.org/MPL/2.0/.

diff --git a/implementation/message/src/deserializer.cpp b/implementation/message/src/deserializer.cpp
index 6017d5a..fb6f670 100644
--- a/implementation/message/src/deserializer.cpp
+++ b/implementation/message/src/deserializer.cpp
@@ -8,12 +8,11 @@
 #ifdef VSOMEIP_DEBUGGING

 #include <iomanip>

 #include <sstream>

-

-#include "../../logging/include/logger.hpp"

 #endif

 

 #include "../include/message_impl.hpp"

 #include "../include/deserializer.hpp"

+#include "../../logging/include/logger.hpp"

 #include "../../utility/include/byteorder.hpp"

 

 namespace vsomeip {

@@ -148,8 +147,9 @@ message * deserializer::deserialize_message() {
     message_impl* deserialized_message = new message_impl;

     if (0 != deserialized_message) {

         if (false == deserialized_message->deserialize(this)) {

+            VSOMEIP_ERROR << "SOME/IP message deserialization failed!";

             delete deserialized_message;

-            deserialized_message = 0;

+            deserialized_message = nullptr;

         }

     }

 

diff --git a/implementation/message/src/message_base_impl.cpp b/implementation/message/src/message_base_impl.cpp
index 616ed63..c9597fc 100644
--- a/implementation/message/src/message_base_impl.cpp
+++ b/implementation/message/src/message_base_impl.cpp
@@ -9,7 +9,8 @@
 namespace vsomeip {

 

 message_base_impl::message_base_impl()

-    : is_reliable_(false) {

+    : is_reliable_(false),

+      is_initial_(false) {

     header_.set_owner(this);

 }

 

@@ -110,4 +111,11 @@ void message_base_impl::set_reliable(bool _is_reliable) {
     is_reliable_ = _is_reliable;

 }

 

+bool message_base_impl::is_initial() const {

+    return is_initial_;

+}

+void message_base_impl::set_initial(bool _is_initial) {

+    is_initial_ = _is_initial;

+}

+

 } // namespace vsomeip