3 files changed, 12 insertions, 14 deletions
diff --git a/implementation/tracing/src/channel_impl.cpp b/implementation/tracing/src/channel_impl.cpp
index 58f67e6..c0bc391 100644
--- a/implementation/tracing/src/channel_impl.cpp
+++ b/implementation/tracing/src/channel_impl.cpp
@@ -3,9 +3,9 @@
 // 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/.
 #include "../include/channel_impl.hpp"
-#include "../../logging/include/logger.hpp"
+#include <vsomeip/internal/logger.hpp>
 
-namespace vsomeip {
+namespace vsomeip_v3 {
 namespace trace {
 
 const filter_id_t FILTER_ID_ERROR(0);
@@ -231,7 +231,7 @@ void channel_impl::remove_filter(filter_id_t _id) {
     negative_.erase(_id);
 }
 
-filter_id_t channel_impl::add_filter_intern(filter_func_t _func, bool _is_positive) {
+filter_id_t channel_impl::add_filter_intern(const filter_func_t& _func, bool _is_positive) {
     filter_id_t its_id = current_filter_id_.fetch_add(1);
 
     std::lock_guard<std::mutex> its_lock(mutex_);
@@ -270,4 +270,4 @@ bool channel_impl::matches(
 }
 
 } // namespace trace
-} // namespace vsomeip
+} // namespace vsomeip_v3
diff --git a/implementation/tracing/src/connector_impl.cpp b/implementation/tracing/src/connector_impl.cpp
index f8655db..f71c92e 100644
--- a/implementation/tracing/src/connector_impl.cpp
+++ b/implementation/tracing/src/connector_impl.cpp
@@ -4,16 +4,15 @@
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 #include <vsomeip/constants.hpp>
+#include <vsomeip/internal/logger.hpp>
 
 #include "../include/channel_impl.hpp"
 #include "../include/connector_impl.hpp"
 #include "../include/defines.hpp"
-#include "../../configuration/include/internal.hpp"
 #include "../../configuration/include/trace.hpp"
-#include "../../logging/include/logger.hpp"
 #include "../../utility/include/byteorder.hpp"
 
-namespace vsomeip {
+namespace vsomeip_v3 {
 namespace trace {
 
 const char *VSOMEIP_TC_DEFAULT_CHANNEL_ID = "TC";
@@ -25,8 +24,7 @@ std::shared_ptr<connector_impl> connector_impl::get() {
 
 connector_impl::connector_impl() :
     is_enabled_(false),
-    is_sd_enabled_(false),
-    is_initialized_(false) {
+    is_sd_enabled_(false) {
 
     channels_[VSOMEIP_TC_DEFAULT_CHANNEL_ID]
         = std::make_shared<channel_impl>(VSOMEIP_TC_DEFAULT_CHANNEL_ID,
@@ -223,4 +221,4 @@ void connector_impl::trace(const byte_t *_header, uint16_t _header_size,
 }
 
 } // namespace trace
-} // namespace vsomeip
+} // namespace vsomeip_v3
diff --git a/implementation/tracing/src/header.cpp b/implementation/tracing/src/header.cpp
index 2f4f3f8..0940e59 100644
--- a/implementation/tracing/src/header.cpp
+++ b/implementation/tracing/src/header.cpp
@@ -10,7 +10,7 @@
 #include "../../endpoints/include/client_endpoint.hpp"
 #include "../../utility/include/byteorder.hpp"
 
-namespace vsomeip {
+namespace vsomeip_v3 {
 namespace trace {
 
 bool header::prepare(const std::shared_ptr<endpoint> &_endpoint,
@@ -52,8 +52,8 @@ bool header::prepare(const endpoint *_endpoint, bool _is_sending,
 }
 
 void header::prepare(const boost::asio::ip::address_v4 &_address,
-		std::uint16_t _port, protocol_e _protocol,
-		bool _is_sending, instance_t _instance) {
+        std::uint16_t _port, protocol_e _protocol,
+        bool _is_sending, instance_t _instance) {
     unsigned long its_address_as_long = _address.to_ulong();
     data_[0] = VSOMEIP_LONG_BYTE3(its_address_as_long);
     data_[1] = VSOMEIP_LONG_BYTE2(its_address_as_long);
@@ -68,4 +68,4 @@ void header::prepare(const boost::asio::ip::address_v4 &_address,
 }
 
 } // namespace trace
-} // namespace vsomeip
+} // namespace vsomeip_v3