JavaUplink Derivations: Match virtual signature with override (requirement to JavaUplink super class) instead of virtual and honor noexcept - don't inline overrides

JavaUplink Specializations Involved:
- BTAdapter
- BTDevice
- BTManager

5 files changed, 10 insertions, 10 deletions

diff --git a/api/direct_bt/BTAdapter.hpp b/api/direct_bt/BTAdapter.hpp
index 3fd1e084..81821779 100644
--- a/api/direct_bt/BTAdapter.hpp
+++ b/api/direct_bt/BTAdapter.hpp
@@ -573,7 +573,7 @@ namespace direct_bt {
             /**
              * Releases this instance.
              */
-            ~BTAdapter() noexcept;
+            ~BTAdapter() noexcept override;
 
             /**
              * Closes this instance, usually being called by destructor or when this adapter is being removed
diff --git a/api/direct_bt/BTDevice.hpp b/api/direct_bt/BTDevice.hpp
index 49911953..270cb5ae 100644
--- a/api/direct_bt/BTDevice.hpp
+++ b/api/direct_bt/BTDevice.hpp
@@ -255,7 +255,7 @@ namespace direct_bt {
             /**
              * Releases this instance after calling {@link #remove()}.
              */
-            ~BTDevice() noexcept;
+            ~BTDevice() noexcept override;
 
             std::string get_java_class() const noexcept override {
                 return java_class();
diff --git a/api/direct_bt/BTManager.hpp b/api/direct_bt/BTManager.hpp
index 226f7ec2..924068e2 100644
--- a/api/direct_bt/BTManager.hpp
+++ b/api/direct_bt/BTManager.hpp
@@ -328,7 +328,7 @@ namespace direct_bt {
                 static BTManager s;
                 return s;
             }
-            ~BTManager() noexcept { close(); }
+            ~BTManager() noexcept override { close(); }
 
             void close() noexcept;
 
diff --git a/api/direct_bt/BTTypes1.hpp b/api/direct_bt/BTTypes1.hpp
index fee27833..d246b232 100644
--- a/api/direct_bt/BTTypes1.hpp
+++ b/api/direct_bt/BTTypes1.hpp
@@ -49,9 +49,9 @@ namespace direct_bt {
             BTObject() noexcept : valid(true) {}
 
         public:
-            virtual std::string toString() const noexcept override { return "BTObject["+to_hexstring(this)+"]"; }
+            std::string toString() const noexcept override { return "BTObject["+to_hexstring(this)+"]"; }
 
-            virtual ~BTObject() noexcept {
+            ~BTObject() noexcept override {
                 valid = false;
             }
 
@@ -60,7 +60,7 @@ namespace direct_bt {
              */
             inline bool isValid() const noexcept { return valid.load(); }
 
-            inline void checkValid() const override {
+            void checkValid() const override {
                 if( !isValid() ) {
                     throw jau::IllegalStateException("BTObject::checkValid: Invalid object: "+toString(), E_FILE_LINE);
                 }
diff --git a/api/direct_bt/DBGattServer.hpp b/api/direct_bt/DBGattServer.hpp
index a7fb0c73..32a3e347 100644
--- a/api/direct_bt/DBGattServer.hpp
+++ b/api/direct_bt/DBGattServer.hpp
@@ -139,7 +139,7 @@ namespace direct_bt {
                 return java_class();
             }
 
-            ~DBGattDesc() {
+            ~DBGattDesc() noexcept override {
                 JAU_TRACE_DBGATT_PRINT("DBGattDesc dtor0: %p", this);
             }
 
@@ -345,7 +345,7 @@ namespace direct_bt {
                 return java_class();
             }
 
-            ~DBGattChar() {
+            ~DBGattChar() noexcept override {
                 JAU_TRACE_DBGATT_PRINT("DBGattChar dtor0: %p", this);
             }
 
@@ -543,7 +543,7 @@ namespace direct_bt {
                 return java_class();
             }
 
-            ~DBGattService() {
+            ~DBGattService() noexcept override {
                 JAU_TRACE_DBGATT_PRINT("DBGattService dtor0: %p", this);
             }
 
@@ -826,7 +826,7 @@ namespace direct_bt {
                 return java_class();
             }
 
-            ~DBGattServer() {
+            ~DBGattServer() noexcept override {
                 #ifdef JAU_TRACE_DBGATT
                     JAU_TRACE_DBGATT_PRINT("DBGattServer dtor0: %p", this);
                     jau::print_backtrace(true);