Changeset 76 in flair-dev for trunk/include/FlairSensorActuator

Timestamp:

Sep 12, 2018, 5:43:31 PM (6 years ago)

Author:

Sanahuja Guillaume

Message:

m

Location:

trunk/include/FlairSensorActuator

Files:

• TargetController.h (modified) (2 diffs)
• TargetEthController.h (modified) (1 diff)

trunk/include/FlairSensorActuator/TargetController.h

@@ -82 +82 @@
   // axis stuff
   unsigned int axisNumber;
-  core::Matrix *axis = NULL;
+  core::Matrix *axis = nullptr;
   virtual void AcquireAxisData(core::Matrix &axis) = 0; // responsible for
                                                           // getting the axis
@@ -90 +90 @@
   // button stuff
   unsigned int buttonNumber;
-  core::Matrix *button = NULL;
+  core::Matrix *button = nullptr;
   virtual void AcquireButtonData(core::Matrix &button) = 0; // responsible for
                                                               // getting the

trunk/include/FlairSensorActuator/TargetEthController.h

@@ -77 +77 @@
   core::TcpSocket *listeningSocket;
   int listeningPort;
-  core::TcpSocket *controlSocket = NULL;
+  core::TcpSocket *controlSocket = nullptr;
   core::UdpSocket *dataSocket;
-  std::string *axisName = NULL;
-  std::string *buttonName = NULL;
+  std::string *axisName = nullptr;
+  std::string *buttonName = nullptr;
   size_t dataFrameSize;
   char *dataFrameBuffer;