Merge remote-tracking branch 'ssvine/fix-rtti'

michaellukashov · Nov 20, 2024 · 9177907 · 9177907
2 parents a94d243 + cfae72f
commit 9177907
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 6 deletions.
diff --git a/src/NetBox/FarDialog.cpp b/src/NetBox/FarDialog.cpp
@@ -15,7 +15,6 @@ inline TRect Rect(int32_t Left, int32_t Top, int32_t Right, int32_t Bottom)
   return TRect(Left, Top, Right, Bottom);
 }
 
-constexpr const TObjectClassId OBJECT_CLASS_TDialogIdleThread = static_cast<TObjectClassId>(nb::counter_id());
 class TFarDialogIdleThread final : public TSimpleThread
 {
 public:

diff --git a/src/NetBox/FarPlugin.cpp b/src/NetBox/FarPlugin.cpp
@@ -1575,7 +1575,6 @@ void TCustomFarPlugin::SaveTerminalScreen()
   FarControl(FCTL_SETUSERSCREEN, 0, nullptr);
 }
 
-const TObjectClassId OBJECT_CLASS_TConsoleTitleParam = static_cast<TObjectClassId>(nb::counter_id());
 class TConsoleTitleParam : public TObject
 {
 public:

diff --git a/src/NetBox/WinSCPFileSystem.cpp b/src/NetBox/WinSCPFileSystem.cpp
@@ -239,7 +239,6 @@ void TFarInteractiveCustomCommand::Prompt(int32_t /*Index*/, const UnicodeString
 
 // Attempt to allow keepalives from background thread.
 // Not finished nor used.
-const TObjectClassId OBJECT_CLASS_TKeepAliveThread = static_cast<TObjectClassId>(nb::counter_id());
 class TKeepAliveThread final : public TSimpleThread
 {
 public:

diff --git a/src/base/ObjIDs.cpp b/src/base/ObjIDs.cpp
@@ -151,4 +151,10 @@ const TObjectClassId OBJECT_CLASS_TRemoteFilePanelItem = static_cast<TObjectClas
 const TObjectClassId OBJECT_CLASS_TWinSCPPlugin = static_cast<TObjectClassId>(nb::counter_id());
 const TObjectClassId OBJECT_CLASS_TFarMessageData = static_cast<TObjectClassId>(nb::counter_id());
 
+const TObjectClassId OBJECT_CLASS_TTerminalItem = static_cast<TObjectClassId>(nb::counter_id());
+const TObjectClassId OBJECT_CLASS_TBackgroundTerminal = static_cast<TObjectClassId>(nb::counter_id());
+const TObjectClassId OBJECT_CLASS_TDialogIdleThread = static_cast<TObjectClassId>(nb::counter_id());
+const TObjectClassId OBJECT_CLASS_TConsoleTitleParam = static_cast<TObjectClassId>(nb::counter_id());
+const TObjectClassId OBJECT_CLASS_TKeepAliveThread = static_cast<TObjectClassId>(nb::counter_id());
+
 } // extern "C"
diff --git a/src/base/ObjIDs.h b/src/base/ObjIDs.h
@@ -146,5 +146,11 @@ extern const TObjectClassId OBJECT_CLASS_TRightsContainer;
 extern const TObjectClassId OBJECT_CLASS_TCopyParamsContainer;
 extern const TObjectClassId OBJECT_CLASS_TLabelList;
 
+extern const TObjectClassId OBJECT_CLASS_TTerminalItem;
+extern const TObjectClassId OBJECT_CLASS_TBackgroundTerminal;
+extern const TObjectClassId OBJECT_CLASS_TDialogIdleThread;
+extern const TObjectClassId OBJECT_CLASS_TConsoleTitleParam;
+extern const TObjectClassId OBJECT_CLASS_TKeepAliveThread;
+
 } // extern "C"
 
diff --git a/src/core/Queue.cpp b/src/core/Queue.cpp
@@ -243,7 +243,6 @@ class TReadDirectoryProgressAction final : public TUserAction
   bool Cancel{false};
 };
 
-constexpr TObjectClassId OBJECT_CLASS_TTerminalItem = static_cast<TObjectClassId>(nb::counter_id());
 class TTerminalItem final : public TSignalThread
 {
   friend class TQueueItem;
@@ -1250,7 +1249,6 @@ bool TTerminalQueue::ContinueParallelOperation() const
 
 // TBackgroundItem
 
-constexpr TObjectClassId OBJECT_CLASS_TBackgroundTerminal = static_cast<TObjectClassId>(nb::counter_id());
 class TBackgroundTerminal final : public TSecondaryTerminal
 {
   friend class TTerminalItem;

diff --git a/src/include/rtti.hpp b/src/include/rtti.hpp
@@ -968,7 +968,7 @@ struct depth
 template<int N>
 struct mark
 {
-  friend constexpr int adl_flag(flag<N>) { return N; }
+  friend constexpr int adl_flag(flag<N>) noexcept { return N; }
   static constexpr int value = N;
 };
-Original file line number
+Diff line change
@@ Expand Up @@
       return TRect(Left, Top, Right, Bottom);
     }
-    constexpr const TObjectClassId OBJECT_CLASS_TDialogIdleThread = static_cast<TObjectClassId>(nb::counter_id());
     class TFarDialogIdleThread final : public TSimpleThread
     {
     public:
@@ Expand Down @@