From 1f197822adcf7e7b5fadbb6d578a3d162fc2b2cd Mon Sep 17 00:00:00 2001
From: David Boehme <boehme3@llnl.gov>
Date: Fri, 2 Aug 2024 10:19:34 -0700
Subject: [PATCH] Make Args::Table::Terminator a constexpr

---
 include/caliper/tools-util/Args.h         | 6 +++---
 src/tools/cali-query/cali-query.cpp       | 2 +-
 src/tools/cali-stat/cali-stat.cpp         | 2 +-
 src/tools/mpi-caliquery/mpi-caliquery.cpp | 2 +-
 src/tools/util/Args.cpp                   | 2 --
 test/cali-annotation-perftest.cpp         | 2 +-
 test/cali-flush-perftest.cpp              | 2 +-
 7 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/include/caliper/tools-util/Args.h b/include/caliper/tools-util/Args.h
index b22ee03a9..613e64fe4 100644
--- a/include/caliper/tools-util/Args.h
+++ b/include/caliper/tools-util/Args.h
@@ -32,11 +32,11 @@ class Args {
         bool        has_argument;
 
         const char* info;
-        const char* argument_info;
-      
-        static const Table Terminator;
+        const char* argument_info;      
     };
 
+    static constexpr Table Terminator = { nullptr, nullptr, 0, false, nullptr, nullptr };
+
     Args();
 
     Args(const Table table[]);
diff --git a/src/tools/cali-query/cali-query.cpp b/src/tools/cali-query/cali-query.cpp
index d7a97b226..31b6de1f4 100644
--- a/src/tools/cali-query/cali-query.cpp
+++ b/src/tools/cali-query/cali-query.cpp
@@ -121,7 +121,7 @@ namespace
           "List global run metadata. Use with -j, -t, etc. to select output format.",
           nullptr
         },
-        Args::Table::Terminator
+        Args::Terminator
     };
 
     /// A node record filter that filters redundant identical node records.
diff --git a/src/tools/cali-stat/cali-stat.cpp b/src/tools/cali-stat/cali-stat.cpp
index 4774fed11..3f25f35ba 100644
--- a/src/tools/cali-stat/cali-stat.cpp
+++ b/src/tools/cali-stat/cali-stat.cpp
@@ -38,7 +38,7 @@ namespace
         },
         { "output", "output", 'o', true,  "Set the output file name", "FILE"  },
         { "help",   "help",   'h', false, "Print help message",       nullptr },
-        Args::Table::Terminator
+        Args::Terminator
     };
 
     class ReuseStat {
diff --git a/src/tools/mpi-caliquery/mpi-caliquery.cpp b/src/tools/mpi-caliquery/mpi-caliquery.cpp
index b9973dc2b..ad49c8aba 100644
--- a/src/tools/mpi-caliquery/mpi-caliquery.cpp
+++ b/src/tools/mpi-caliquery/mpi-caliquery.cpp
@@ -99,7 +99,7 @@ const Args::Table option_table[] = {
     { "verbose", "verbose", 'v', false, "Be verbose.",              nullptr },
     { "help",    "help",    'h', true,  "Print help message",       nullptr },
     { "output", "output",   'o', true,  "Set the output file name", "FILE"  },
-    Args::Table::Terminator
+    Args::Terminator
 };
 
 
diff --git a/src/tools/util/Args.cpp b/src/tools/util/Args.cpp
index 7474853d8..3594806c9 100644
--- a/src/tools/util/Args.cpp
+++ b/src/tools/util/Args.cpp
@@ -12,8 +12,6 @@
 using namespace std;
 using namespace util;
 
-const Args::Table Args::Table::Terminator { 0, 0, 0, false, 0, 0 };
-
 struct Args::ArgsImpl
 {
     vector<Args::Table> m_options;     ///< Option list
diff --git a/test/cali-annotation-perftest.cpp b/test/cali-annotation-perftest.cpp
index 5f54ac389..677eb15ab 100644
--- a/test/cali-annotation-perftest.cpp
+++ b/test/cali-annotation-perftest.cpp
@@ -166,7 +166,7 @@ int main(int argc, char* argv[])
         { "quiet", "quiet", 'q', false, "Don't print output", nullptr },
         { "help",  "help",  'h', false, "Print help",         nullptr },
 
-        util::Args::Table::Terminator
+        util::Args::Terminator
     };
 
     // --- initialization
diff --git a/test/cali-flush-perftest.cpp b/test/cali-flush-perftest.cpp
index ad0ecb8f5..cfdcd8c0f 100644
--- a/test/cali-flush-perftest.cpp
+++ b/test/cali-flush-perftest.cpp
@@ -79,7 +79,7 @@ int main(int argc, char* argv[])
 
         { "help", "help", 'h', false, "Print help", nullptr },
 
-        util::Args::Table::Terminator
+        util::Args::Terminator
     };
 
     // --- Initialization