From 8cfbdae9fe7ddf279df527a31d9f0e067bf26dc7 Mon Sep 17 00:00:00 2001
From: Joscha Schmiedt <joscha@schmiedt.dev>
Date: Fri, 13 Sep 2024 22:05:34 +0200
Subject: [PATCH] Fix superflous `inline` causing linker errors
---
include/linkahead/connection.h | 2 +-
src/linkahead/configuration.cpp | 2 +-
src/linkahead/connection.cpp | 4 ++--
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/include/linkahead/connection.h b/include/linkahead/connection.h
index aca0966..97fdcd9 100644
--- a/include/linkahead/connection.h
+++ b/include/linkahead/connection.h
@@ -171,7 +171,7 @@ private:
mutable std::map<std::string, std::shared_ptr<Connection>> connections;
mutable std::string default_connection_name;
- static ConnectionManager instance;
+ static ConnectionManager mInstance;
inline ConnectionManager(){};
diff --git a/src/linkahead/configuration.cpp b/src/linkahead/configuration.cpp
index f8074ba..1c60cfe 100644
--- a/src/linkahead/configuration.cpp
+++ b/src/linkahead/configuration.cpp
@@ -427,7 +427,7 @@ auto ConfigurationManager::mGetDefaultConnectionName() const -> std::string {
throw ConfigurationError("Could not determine the default connection.");
}
-inline ConfigurationManager &ConfigurationManager::GetInstance() { return mInstance; }
+ConfigurationManager &ConfigurationManager::GetInstance() { return mInstance; }
// TODO(tf) This has apparently a cognitive complexity of 34>25 (threshold).
auto ConfigurationManager::InitializeDefaults() -> int { // NOLINT
diff --git a/src/linkahead/connection.cpp b/src/linkahead/connection.cpp
index 373b367..bff799b 100644
--- a/src/linkahead/connection.cpp
+++ b/src/linkahead/connection.cpp
@@ -67,10 +67,10 @@ using linkahead::transaction::Transaction;
using linkahead::transaction::TransactionStatus;
-ConnectionManager ConnectionManager::instance;
+ConnectionManager ConnectionManager::mInstance;
ConnectionManager &ConnectionManager::GetInstance() {
- return instance;
+ return mInstance;
}
Connection::Connection(const ConnectionConfiguration &configuration) {
--
GitLab