From ef28ad66472c48ad38b52724d66cc187e4af2989 Mon Sep 17 00:00:00 2001
From: Riccardo Maria Bianchi <riccardo.maria.bianchi@cern.ch>
Date: Sat, 22 Jun 2024 03:20:33 +0200
Subject: [PATCH] Fix errors from git rebase
---
GeoModelIO/GeoModelDBManager/GeoModelDBManager/GMDBManager.h | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/GeoModelIO/GeoModelDBManager/GeoModelDBManager/GMDBManager.h b/GeoModelIO/GeoModelDBManager/GeoModelDBManager/GMDBManager.h
index 1c33537c0..404eab0f6 100644
--- a/GeoModelIO/GeoModelDBManager/GeoModelDBManager/GMDBManager.h
+++ b/GeoModelIO/GeoModelDBManager/GeoModelDBManager/GMDBManager.h
@@ -308,7 +308,7 @@ class GMDBManager {
std::unordered_map<unsigned int, std::string> getAll_TableIDsNodeTypes();
std::unordered_map<std::string, unsigned int> getAll_NodeTypesTableIDs();
- std::vector<std::vector<std::string>> getTableRecords(const std::string_view tableName) const;
+ std::vector<std::vector<std::string>> getTableRecords_String(const std::string_view tableName) const;
DBRowEntry getTableRecords_VecData(const std::string_view tableName) const;
DBRowsList getTableRecords_VecVecData(const std::string_view tableName) const;
@@ -405,8 +405,6 @@ class GMDBManager {
int getTableColIndex(const std::string &tableName,
const std::string &colName);
- bool storeRootVolume(const unsigned int &id, const std::string &nodeType);
-
std::string m_dbpath;
bool m_debug;
--
GitLab