From 1657dd4d1fea57ac6ea92c0f7d4ddbe7488ffa48 Mon Sep 17 00:00:00 2001 From: Nathan Brei Date: Wed, 31 Jul 2024 23:32:48 -0400 Subject: [PATCH] Make JVersion.h C++14 compatible again --- src/libraries/JANA/JVersion.h.in | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/libraries/JANA/JVersion.h.in b/src/libraries/JANA/JVersion.h.in index 454e3a84c..ac495c47f 100644 --- a/src/libraries/JANA/JVersion.h.in +++ b/src/libraries/JANA/JVersion.h.in @@ -10,6 +10,10 @@ #define JANA2_HAVE_ROOT @JANA2_HAVE_ROOT@ #define JANA2_HAVE_XERCES @JANA2_HAVE_XERCES@ +#define JANA2_COMMIT_HASH "@JVERSION_COMMIT_HASH@" +#define JANA2_COMMIT_DATE "@JVERSION_COMMIT_DATE@" +#define JANA2_INSTALL_PREFIX "@CMAKE_INSTALL_PREFIX@" + struct JVersion { @@ -17,10 +21,6 @@ struct JVersion { static const uint64_t minor = @jana2_VERSION_MINOR@; static const uint64_t patch = @jana2_VERSION_PATCH@; - inline static const std::string last_commit_hash = "@JVERSION_COMMIT_HASH@"; - inline static const std::string last_commit_date = "@JVERSION_COMMIT_DATE@"; - inline static const std::string installdir = "@CMAKE_INSTALL_PREFIX@"; - static const bool is_unknown = @JVERSION_UNKNOWN@; static const bool is_release = @JVERSION_RELEASE@; static const bool is_modified = @JVERSION_MODIFIED@; @@ -29,9 +29,9 @@ struct JVersion { static constexpr uint64_t GetMinorNumber() { return minor; } static constexpr uint64_t GetPatchNumber() { return patch; } - static std::string GetCommitHash() { return last_commit_hash; } - static std::string GetCommitDate() { return last_commit_date; } - static std::string GetInstallDir() { return installdir; } + static std::string GetCommitHash() { return JANA2_COMMIT_HASH; } + static std::string GetCommitDate() { return JANA2_COMMIT_DATE; } + static std::string GetInstallDir() { return JANA2_INSTALL_PREFIX; } static constexpr bool HasPodio() { return JANA2_HAVE_PODIO; } static constexpr bool HasROOT() { return JANA2_HAVE_ROOT; }