X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/dccf1b41e9c7b5a696f01abceaa2779fe65f154f..3d7871258a01dc77c95cd4618034b8fd89bbd8d9:/src/surf/ns3/ns3_simulator.h

diff --git a/src/surf/ns3/ns3_simulator.h b/src/surf/ns3/ns3_simulator.h
index 1114a721d0..2847a6037f 100644
--- a/src/surf/ns3/ns3_simulator.h
+++ b/src/surf/ns3/ns3_simulator.h
@@ -7,48 +7,41 @@
 #ifndef _NS3_SIM_H
 #define _NS3_SIM_H
 
-#ifdef __cplusplus
-
 #include <cstdint>
 
 #include "ns3_interface.h"
-#include <ns3/core-module.h>
 
-#include <ns3/node.h>
-#include <ns3/global-route-manager.h>
 #include <ns3/csma-helper.h>
+#include <ns3/global-route-manager.h>
 #include <ns3/internet-stack-helper.h>
 #include <ns3/ipv4-address-helper.h>
-#include <ns3/point-to-point-helper.h>
 #include <ns3/packet-sink-helper.h>
-#include <ns3/inet-socket-address.h>
+#include <ns3/point-to-point-helper.h>
 #include <ns3/tcp-socket-factory.h>
 
 class SgFlow {
 public:
-  SgFlow(uint32_t totalBytes, simgrid::surf::NetworkNS3Action * action);
+  SgFlow(uint32_t totalBytes, simgrid::surf::NetworkNS3Action* action);
 
-//private:
+  // private:
   std::uint32_t bufferedBytes_ = 0;
-  std::uint32_t sentBytes_ = 0;
+  std::uint32_t sentBytes_     = 0;
   std::uint32_t remaining_;
   std::uint32_t totalBytes_;
   bool finished_ = false;
   simgrid::surf::NetworkNS3Action* action_;
 };
 
-void StartFlow(ns3::Ptr<ns3::Socket> sock, const char *to, uint16_t port_number);
+void StartFlow(ns3::Ptr<ns3::Socket> sock, const char* to, uint16_t port_number);
 
-static inline const char *transformSocketPtr (ns3::Ptr<ns3::Socket> localSocket)
+static inline const char* transformSocketPtr(ns3::Ptr<ns3::Socket> localSocket)
 {
   static char key[24];
   std::stringstream sstream;
-  sstream << localSocket ;
-  snprintf(key,24,"%s",sstream.str().c_str());
+  sstream << localSocket;
+  snprintf(key, 24, "%s", sstream.str().c_str());
 
   return key;
 }
 
-#endif                          /* __cplusplus */
-
 #endif