Changeset 107:614b9ff033c1 in xplra for src/client/c/hu/varadiistvan/xplra/xplra.cc

Timestamp:

12/15/22 19:26:40 (17 months ago)

Author:

István Váradi <ivaradi@…>

Branch:

default

Phase:

public

Message:

Modernized the exception specifications in the C++ client

File:

• src/client/c/hu/varadiistvan/xplra/xplra.cc (modified) (25 diffs)

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

@@ -90 +90 @@
      * @return the ID of the new value
      */
-    static int addValue(Value value) throw();
+    static int addValue(Value value) noexcept;
 
     /**
      * Get the value with the given ID.
      */
-    static Value getValue(int valueID) throw();
+    static Value getValue(int valueID) noexcept;
 
     /**
      * Clear the value with the given ID.
      */
-    static void clearValue(int valueID) throw();
+    static void clearValue(int valueID) noexcept;
 
 private:
@@ -119 +119 @@
      * Construct a slot with the given value
      */
-    Slot(Value value) throw();
+    Slot(Value value) noexcept;
 
     /**
@@ -125 +125 @@
      * should be called for a slot with no value.
      */
-    int setValue(Value value) throw();
+    int setValue(Value value) noexcept;
 
     /**
@@ -131 +131 @@
      * returned (converted to value).
      */
-    Value getValue() const throw();
+    Value getValue() const noexcept;
 
     /**
      * Clear the value and set the given next free index.
      */
-    void clear(int nextFreeIndex) throw();
+    void clear(int nextFreeIndex) noexcept;
 };
 
@@ -150 +150 @@
 
 template <class Value>
-inline Slot<Value>::Slot(Value value) throw() :
+inline Slot<Value>::Slot(Value value) noexcept :
     valid(true)
 {
@@ -159 +159 @@
 
 template <class Value>
-inline int Slot<Value>::setValue(Value value) throw()
+inline int Slot<Value>::setValue(Value value) noexcept
 {
     assert(!valid);
@@ -171 +171 @@
 
 template <class Value>
-inline Value Slot<Value>::getValue() const throw()
+inline Value Slot<Value>::getValue() const noexcept
 {
     return valid ? value : static_cast<Value>(0);
@@ -179 +179 @@
 
 template <class Value>
-inline void Slot<Value>::clear(int nextFreeIndex) throw()
+inline void Slot<Value>::clear(int nextFreeIndex) noexcept
 {
     assert(valid);
@@ -189 +189 @@
 
 template <class Value>
-int Slot<Value>::addValue(Value value) throw()
+int Slot<Value>::addValue(Value value) noexcept
 {
     int id = firstFree;
@@ -206 +206 @@
 
 template <class Value>
-Value Slot<Value>::getValue(int valueID) throw()
+Value Slot<Value>::getValue(int valueID) noexcept
 {
     size_t index = static_cast<size_t>(valueID);
@@ -216 +216 @@
 
 template <class Value>
-void Slot<Value>::clearValue(int valueID) throw()
+void Slot<Value>::clearValue(int valueID) noexcept
 {
     size_t index = static_cast<size_t>(valueID);
@@ -248 +248 @@
      * Get the connection for the given multi-dataref buffer.
      */
-    static Connection& get(const MultiBuffer& buffer) throw();
+    static Connection& get(const MultiBuffer& buffer) noexcept;
 
 private:
@@ -275 +275 @@
      * Construct the connection
      */
-    Connection() throw();
+    Connection() noexcept;
 
     /**
      * Destroy the connection.
      */
-    ~Connection() throw();
+    ~Connection() noexcept;
 
     /**
      * Handle the currently pending exception.
      */
-    void handleException() throw();
+    void handleException() noexcept;
 
     /**
      * Get the last error code.
      */
-    int getLastError(unsigned long* lastErrorSubCode) const throw();
+    int getLastError(unsigned long* lastErrorSubCode) const noexcept;
 
     /**
      * Get the string representation of the last error code.
      */
-    const char* getLastErrorString() const throw();
+    const char* getLastErrorString() const noexcept;
 
     /**
      * Clear the last error code.
      */
-    void clearLastError() throw();
+    void clearLastError() noexcept;
 
     /**
@@ -307 +307 @@
      * @return the ID of the new getter.
      */
-    int createMultiGetter() throw();
+    int createMultiGetter() noexcept;
 
     /**
@@ -314 +314 @@
      * @return the ID of the new setter.
      */
-    int createMultiSetter() throw();
+    int createMultiSetter() noexcept;
 
     /**
@@ -324 +324 @@
      * @return whether the buffer was found and could be destroyed.
      */
-    bool destroyMultiBuffer(int bufferID) throw(Exception);
+    bool destroyMultiBuffer(int bufferID);
 };
 
 //------------------------------------------------------------------------------
 
-inline Connection& Connection::get(const MultiBuffer& buffer) throw()
+inline Connection& Connection::get(const MultiBuffer& buffer) noexcept
 {
     return static_cast<Connection&>(buffer.getXPlane());
@@ -336 +336 @@
 //------------------------------------------------------------------------------
 
-inline Connection::Connection() throw() :
+inline Connection::Connection() noexcept :
     lastErrorCode(0),
     lastErrorSubCode(0)
@@ -344 +344 @@
 //------------------------------------------------------------------------------
 
-Connection::~Connection() throw()
+Connection::~Connection() noexcept
 {
     for(multiBufferIDs_t::iterator i = multiBufferIDs.begin();
@@ -355 +355 @@
 //------------------------------------------------------------------------------
 
-void Connection::handleException() throw()
+void Connection::handleException() noexcept
 {
     try {
@@ -393 +393 @@
 
 inline int Connection::getLastError(unsigned long* lastErrorSubCode)
-    const throw()
+    const noexcept
 {
     if (lastErrorSubCode!=0) *lastErrorSubCode = this->lastErrorSubCode;
@@ -401 +401 @@
 //------------------------------------------------------------------------------
 
-inline const char* Connection::getLastErrorString() const throw()
+inline const char* Connection::getLastErrorString() const noexcept
 {
     return (lastErrorCode==ERROR_NONE) ? 0 : lastErrorString.c_str();
@@ -408 +408 @@
 //------------------------------------------------------------------------------
 
-inline void Connection::clearLastError() throw()
+inline void Connection::clearLastError() noexcept
 {
     lastErrorCode = ERROR_NONE;
@@ -417 +417 @@
 //------------------------------------------------------------------------------
 
-inline int Connection::createMultiGetter() throw()
+inline int Connection::createMultiGetter() noexcept
 {
     MultiGetter& getter = XPlane::createMultiGetter();
@@ -425 +425 @@
 //------------------------------------------------------------------------------
 
-inline int Connection::createMultiSetter() throw()
+inline int Connection::createMultiSetter() noexcept
 {
     MultiSetter& setter = XPlane::createMultiSetter();
@@ -433 +433 @@
 //------------------------------------------------------------------------------
 
-bool Connection::destroyMultiBuffer(int bufferID) throw(Exception)
+bool Connection::destroyMultiBuffer(int bufferID)
 {
     MultiBuffer* buffer = MultiBufferSlot::getValue(bufferID);