Changeset 92:e3a0abb22ef4 in xplra

Timestamp:

09/21/17 17:00:26 (7 years ago)

Author:

István Váradi <ivaradi@…>

Branch:

default

Phase:

public

Message:

C++11 compatibility

Location:

src

Files:

• client/c/hu/varadiistvan/xplra/XPlane.cc (modified) (7 diffs)
• client/c/hu/varadiistvan/xplra/xplra.cc (modified) (3 diffs)
• plugin/src/xplra/MessageWindow.h (modified) (1 diff)
• plugin/src/xplra/Protocol.h (modified) (1 diff)
• plugin/src/xplra/RequestQueue.h (modified) (1 diff)

src/client/c/hu/varadiistvan/xplra/XPlane.cc

@@ -57 +57 @@
 using xplra::Protocol;
 
-using std::auto_ptr;
+using std::unique_ptr;
 using std::string;
 using std::min;
@@ -149 +149 @@
     if (socket!=0) return;
 
-    auto_ptr<LocalClientSocket> clientSocket(new LocalClientSocket("xplra",
-                                                                   &waiter));
+    unique_ptr<LocalClientSocket> clientSocket(new LocalClientSocket("xplra",
+                                                                     &waiter));
     LocalConnector& connector = clientSocket->getConnector();
 
@@ -342 +342 @@
     length = getArray(name, Protocol::TYPE_FLOAT_ARRAY, -1, offset);
 
-    auto_ptr<float> data(new float[length]);
+    unique_ptr<float[]> data(new float[length]);
     if (!stream->read(data.get(), length*sizeof(float))) checkStream();
     return data.release();
@@ -366 +366 @@
     length = getArray(name, Protocol::TYPE_INT_ARRAY, -1, offset);
 
-    auto_ptr<int32_t> data(new int32_t[length]);
+    unique_ptr<int32_t[]> data(new int32_t[length]);
     if (!stream->read(data.get(), length*sizeof(int32_t))) checkStream();
     return data.release();
@@ -390 +390 @@
     length = getArray(name, Protocol::TYPE_BYTE_ARRAY, -1, offset);
 
-    auto_ptr<uint8_t> data(new uint8_t[length]);
+    unique_ptr<uint8_t[]> data(new uint8_t[length]);
     if (!stream->read(data.get(), length*sizeof(uint8_t))) checkStream();
     return data.release();
@@ -400 +400 @@
 {
     size_t length = 0;
-    auto_ptr<uint8_t> data(getByteArray(name, length, offset));
+    unique_ptr<uint8_t[]> data(getByteArray(name, length, offset));
     return string(reinterpret_cast<char*>(data.get()));
 }
@@ -498 +498 @@
                      length, offset);
     } else {
-        auto_ptr<uint8_t> buffer(new uint8_t[length]);
+        unique_ptr<uint8_t[]> buffer(new uint8_t[length]);
         memcpy(buffer.get(), value, valueLength);
         memset(buffer.get() + valueLength, 0, length - valueLength);

src/client/c/hu/varadiistvan/xplra/xplra.cc

@@ -59 +59 @@
 using std::vector;
 using std::set;
-using std::auto_ptr;
+using std::unique_ptr;
 
 //------------------------------------------------------------------------------
@@ -488 +488 @@
 {
     try {
-        auto_ptr<Connection> connection(new Connection());
+        unique_ptr<Connection> connection(new Connection());
         connection->connect();
         return ConnectionSlot::addValue(connection.release());
@@ -498 +498 @@
 //------------------------------------------------------------------------------
 
-extern "C"int xplra_get_versions(int connectionID,
-                                 int* xplaneVersion, int* xplmVersion,
-                                 int* xplraVersion)
+extern "C" int xplra_get_versions(int connectionID,
+                                  int* xplaneVersion, int* xplmVersion,
+                                  int* xplraVersion)
 {
     Connection* connection = ConnectionSlot::getValue(connectionID);

src/plugin/src/xplra/MessageWindow.h

@@ -98 +98 @@
      * started to be scrolled, if it should be scrolled.
      */
-    static const float scrollTimeout = 1.0;
+    static constexpr float scrollTimeout = 1.0;
 
     /**
      * The amount of time in seconds between each character step.
      */
-    static const float scrollInterval = 0.1;
+    static constexpr float scrollInterval = 0.1;
 
 private:

src/plugin/src/xplra/Protocol.h

@@ -259 +259 @@
      * The maximal message duration
      */
-    static const float MAX_MESSAGE_DURATION = 5*60;
+    static constexpr float MAX_MESSAGE_DURATION = 5*60;
 
     /**

src/plugin/src/xplra/RequestQueue.h

@@ -76 +76 @@
      * The interval of the flight loop.
      */
-    static const float flightLoopInterval = 0.1;
+    static constexpr float flightLoopInterval = 0.1;
 #endif