Commit cfacea6c authored by Shervin Nourbakhsh's avatar Shervin Nourbakhsh
Browse files

(split2) Merge branch 'cpp_master'

parents 56ef3a31 0eea43a2
Pipeline #8854 failed with stage
...@@ -15,10 +15,10 @@ ...@@ -15,10 +15,10 @@
*/ */
#include "ServicesImpl.h" #include "ServicesImpl.h"
#include "../SocketException.h" #include "SocketException.h"
#include "../ConnectionTimeout.h" #include "ConnectionTimeout.h"
#include "../message/JSON.h" #include "message/JSON.h"
#include "../message/Message.h" #include "message/Message.h"
#include "RequestSocketImpl.h" #include "RequestSocketImpl.h"
#include <iostream> #include <iostream>
#include <sstream> #include <sstream>
......
...@@ -15,8 +15,8 @@ ...@@ -15,8 +15,8 @@
*/ */
#include "SocketWaitingImpl.h" #include "SocketWaitingImpl.h"
#include "../Application.h" #include "Application.h"
#include "../message/Message.h" #include "message/Message.h"
#include "WaitingImplSet.h" #include "WaitingImplSet.h"
#include <iostream> #include <iostream>
......
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
*/ */
#include "StreamSocketImpl.h" #include "StreamSocketImpl.h"
#include "../message/Message.h" #include "message/Message.h"
#include <iostream> #include <iostream>
using namespace std; using namespace std;
......
...@@ -15,13 +15,13 @@ ...@@ -15,13 +15,13 @@
*/ */
#include "SubscriberImpl.h" #include "SubscriberImpl.h"
#include "../Serializer.h" #include "Serializer.h"
#include "CancelIdGenerator.h" #include "CancelIdGenerator.h"
#include "ServicesImpl.h" #include "ServicesImpl.h"
#include "RequestSocketImpl.h" #include "RequestSocketImpl.h"
#include "../Server.h" #include "Server.h"
#include "../message/JSON.h" #include "message/JSON.h"
#include "../message/Message.h" #include "message/Message.h"
#include <sstream> #include <sstream>
using namespace std; using namespace std;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment