moved from c headers

manual/manual-api/mainReceiver.cpp

@@ -19,18 +19,18 @@ It is linked in manual/manual-api from slsReceiverSoftware/include ]
 #include "sls_detector_defs.h"
 #include "slsReceiverUsers.h"
 
-#include <iostream>
+#include <csignal>	//SIGINT
-#include <string.h>
-#include <signal.h>	//SIGINT
 #include <cstdlib>		//system
+#include <cstring>
+#include <iostream>
 //#include "utilities.h"
 //#include "logger.h"
+#include <cerrno>
+#include <string>
 #include <sys/types.h>	//wait
 #include <sys/wait.h>	//wait
-#include <string>
-#include <unistd.h> 	//usleep
-#include <errno.h>
 #include <syscall.h>	//tid
+#include <unistd.h> 	//usleep
 using namespace std;
 
 

slsReceiverSoftware/src/DataStreamer.cpp

@@ -10,8 +10,8 @@
 #include "ZmqSocket.h"
 #include "sls_detector_exceptions.h"
 
+#include <cerrno>
 #include <iostream>
-#include <errno.h>
 
 const std::string DataStreamer::TypeName = "DataStreamer";
 

slsReceiverSoftware/src/Listener.cpp

@@ -13,9 +13,9 @@
 #include "container_utils.h" // For sls::make_unique<>
 #include "sls_detector_exceptions.h"
 
-#include <iostream>
+#include <cerrno>
-#include <errno.h>
 #include <cstring>
+#include <iostream>
 
 const std::string Listener::TypeName = "Listener";
 

slsReceiverSoftware/src/main.cpp

@@ -5,14 +5,14 @@
 #include "slsReceiverUsers.h"
 #include "logger.h"
 
-#include <iostream>
+#include <csignal>	//SIGINT
-#include <string.h>
-#include <signal.h>	//SIGINT
 #include <cstdlib>		//system
+#include <cstring>
+#include <iostream>
 #include <sys/types.h>	//wait
 #include <sys/wait.h>	//wait
-#include <unistd.h> 	//usleep
 #include <syscall.h>
+#include <unistd.h> 	//usleep
 
 
 bool keeprunning;

slsReceiverSoftware/src/slsReceiver.cpp

@@ -3,13 +3,13 @@
  * @short creates the UDP and TCP class objects
  ***********************************************/
 
-#include <iostream>
+#include <cstdlib>
-#include <string>
-#include <sstream>
 #include <fstream>
-#include <stdlib.h>
-#include <map>
 #include <getopt.h>
+#include <iostream>
+#include <map>
+#include <sstream>
+#include <string>
 
 #include "container_utils.h" // For sls::make_unique<>
 

slsReceiverSoftware/src/slsReceiverImplementation.cpp

@@ -12,13 +12,13 @@
 #include "Fifo.h"
 #include "ZmqSocket.h" 		//just for the zmq port define
 
-#include <sys/stat.h> 		// stat
+#include <cerrno>			//eperm
-#include <iostream>
-#include <string.h>
 #include <cstdlib>			//system
+#include <cstring>
 #include <cstring>			//strcpy
-#include <errno.h>			//eperm
 #include <fstream>
+#include <iostream>
+#include <sys/stat.h> 		// stat
 
 
 /** cosntructor & destructor */

slsReceiverSoftware/src/slsReceiverTCPIPInterface.cpp

@@ -11,16 +11,16 @@
 #include "slsReceiver.h"
 #include "versionAPI.h"
 
-#include  <stdlib.h>	//EXIT
+#include <array>
-#include <iostream>
+#include  <cstdlib>	//EXIT
-#include <string>
+#include <cstdlib>
-#include <sstream>
 #include <fstream>
-#include <stdlib.h>
+#include <iostream>
+#include <memory>	//unique_ptr
+#include <sstream>
+#include <string>
 #include <syscall.h>
 #include <vector>
-#include <array>
-#include <memory>	//unique_ptr
 
 slsReceiverTCPIPInterface::~slsReceiverTCPIPInterface() {
 	stop();