Fix many of the warnings that show up when compiling with GCC 15.2

4 files changed, 4 insertions, 7 deletions

diff --git a/view/sharedcache/core/SharedCacheController.cpp b/view/sharedcache/core/SharedCacheController.cpp
index ce3fde2c..d300017e 100644
--- a/view/sharedcache/core/SharedCacheController.cpp
+++ b/view/sharedcache/core/SharedCacheController.cpp
@@ -8,7 +8,8 @@ using namespace BinaryNinja::DSC;
 // Unique ID for a given Binary View.
 typedef uint64_t ViewId;
 
-std::shared_mutex GlobalControllersMutex;
+static std::shared_mutex GlobalControllersMutex;
+static const char* METADATA_KEY = "shared_cache";
 
 std::map<ViewId, DSCRef<SharedCacheController>>& GlobalControllers()
 {
diff --git a/view/sharedcache/core/SharedCacheController.h b/view/sharedcache/core/SharedCacheController.h
index cda3653c..cb381cbd 100644
--- a/view/sharedcache/core/SharedCacheController.h
+++ b/view/sharedcache/core/SharedCacheController.h
@@ -11,10 +11,6 @@ DECLARE_DSC_API_OBJECT(BNSharedCacheController, SharedCacheController);
 void RegisterSharedCacheControllerDestructor();
 
 namespace BinaryNinja::DSC {
-	static const char* METADATA_KEY = "shared_cache";
-	static const char* OLD_METADATA_KEY_COUNT = "SHAREDCACHE-ModifiedState-Count";
-	static const char* OLD_METADATA_KEY_PREFIX = "SHAREDCACHE-ModifiedState-";
-
 	// Represents the view state for a given `DSCache`
 	class SharedCacheController : public DSCRefCountObject
 	{
diff --git a/view/sharedcache/core/SharedCacheView.cpp b/view/sharedcache/core/SharedCacheView.cpp
index a1428eab..dac39278 100644
--- a/view/sharedcache/core/SharedCacheView.cpp
+++ b/view/sharedcache/core/SharedCacheView.cpp
@@ -10,6 +10,8 @@
 using namespace BinaryNinja;
 using namespace BinaryNinja::DSC;
 
+static const char* VIEW_METADATA_KEY = "shared_cache_view";
+
 SharedCacheViewType::SharedCacheViewType() : BinaryViewType(VIEW_NAME, VIEW_NAME) {}
 
 // We register all our one-shot stuff here, such as the object destructor.
diff --git a/view/sharedcache/core/SharedCacheView.h b/view/sharedcache/core/SharedCacheView.h
index 9318c66c..5f916b30 100644
--- a/view/sharedcache/core/SharedCacheView.h
+++ b/view/sharedcache/core/SharedCacheView.h
@@ -7,8 +7,6 @@
 
 #include <binaryninjaapi.h>
 
-static const char* VIEW_METADATA_KEY = "shared_cache_view";
-
 class SharedCacheView : public BinaryNinja::BinaryView
 {
 	bool m_parseOnly;