(split2) Merge branch 'cpp_master'

cfacea6c · Shervin Nourbakhsh · 56ef3a31 · 0eea43a2 · cfacea6c · cfacea6c
Commit cfacea6c authored Oct 06, 2020 by Shervin Nourbakhsh
--- a/src/cameo/StatusEvent.h
+++ b/src/cameo/StatusEvent.h
--- a/src/cameo/SubscriberCreationException.cpp
+++ b/src/cameo/SubscriberCreationException.cpp
--- a/src/cameo/TimeCondition.cpp
+++ b/src/cameo/TimeCondition.cpp
--- a/src/cameo/UnmanagedApplicationException.cpp
+++ b/src/cameo/UnmanagedApplicationException.cpp
--- a/src/cameo/impl/CancelIdGenerator.cpp
+++ b/src/cameo/impl/CancelIdGenerator.cpp
--- a/src/cameo/impl/CancelIdGenerator.h
+++ b/src/cameo/impl/CancelIdGenerator.h
--- a/src/cameo/impl/GenericWaitingImpl.cpp
+++ b/src/cameo/impl/GenericWaitingImpl.cpp
@@ -18,7 +18,7 @@

 #include <iostream>

-#include "../Application.h"
+#include "Application.h"
 #include "WaitingImplSet.h"

 using namespace std;

--- a/src/cameo/impl/GenericWaitingImpl.h
+++ b/src/cameo/impl/GenericWaitingImpl.h
--- a/src/cameo/impl/HandlerImpl.cpp
+++ b/src/cameo/impl/HandlerImpl.cpp
--- a/src/cameo/impl/HandlerImpl.h
+++ b/src/cameo/impl/HandlerImpl.h
--- a/src/cameo/impl/PublisherImpl.cpp
+++ b/src/cameo/impl/PublisherImpl.cpp
@@ -15,12 +15,12 @@
 */

 #include "PublisherImpl.h"
-#include "../Application.h"
-#include "../Serializer.h"
+#include "Application.h"
+#include "Serializer.h"
 #include "ServicesImpl.h"
 #include "RequestSocketImpl.h"
-#include "../message/JSON.h"
-#include "../message/Message.h"
+#include "message/JSON.h"
+#include "message/Message.h"
 #include <sstream>

 using namespace std;

--- a/src/cameo/impl/PublisherImpl.h
+++ b/src/cameo/impl/PublisherImpl.h
--- a/src/cameo/impl/RequestImpl.cpp
+++ b/src/cameo/impl/RequestImpl.cpp
@@ -16,12 +16,12 @@

 #include "RequestImpl.h"

-#include "../Application.h"
-#include "../Serializer.h"
+#include "Application.h"
+#include "Serializer.h"
 #include "ServicesImpl.h"
 #include "RequestSocketImpl.h"
-#include "../message/JSON.h"
-#include "../message/Message.h"
+#include "message/JSON.h"
+#include "message/Message.h"
 #include <sstream>

 using namespace std;

--- a/src/cameo/impl/RequestImpl.h
+++ b/src/cameo/impl/RequestImpl.h
--- a/src/cameo/impl/RequestSocketImpl.cpp
+++ b/src/cameo/impl/RequestSocketImpl.cpp
@@ -16,7 +16,7 @@

 #include "RequestSocketImpl.h"
 #include "ServicesImpl.h"
-#include "../ConnectionTimeout.h"
+#include "ConnectionTimeout.h"
 #include <iostream>

 #include <chrono>

--- a/src/cameo/impl/RequestSocketImpl.h
+++ b/src/cameo/impl/RequestSocketImpl.h
--- a/src/cameo/impl/RequesterImpl.cpp
+++ b/src/cameo/impl/RequesterImpl.cpp
@@ -15,12 +15,12 @@
 */

 #include "RequesterImpl.h"
-#include "../Application.h"
-#include "../Serializer.h"
+#include "Application.h"
+#include "Serializer.h"
 #include "ServicesImpl.h"
 #include "RequestSocketImpl.h"
-#include "../message/JSON.h"
-#include "../message/Message.h"
+#include "message/JSON.h"
+#include "message/Message.h"
 #include <sstream>

 using namespace std;

--- a/src/cameo/impl/RequesterImpl.h
+++ b/src/cameo/impl/RequesterImpl.h
--- a/src/cameo/impl/ResponderImpl.cpp
+++ b/src/cameo/impl/ResponderImpl.cpp
@@ -15,13 +15,13 @@
 */

 #include "ResponderImpl.h"
-#include "../Application.h"
-#include "../Serializer.h"
+#include "Application.h"
+#include "Serializer.h"
 #include "ServicesImpl.h"
 #include "RequestImpl.h"
 #include "RequestSocketImpl.h"
-#include "../message/JSON.h"
-#include "../message/Message.h"
+#include "message/JSON.h"
+#include "message/Message.h"
 #include <sstream>

 using namespace std;

--- a/src/cameo/impl/ResponderImpl.h
+++ b/src/cameo/impl/ResponderImpl.h