From e52616740ab5a4b3fb6c9b30d394fc93e5550b8b Mon Sep 17 00:00:00 2001
From: Evgeny Malygin <emalygin@bloomberg.net>
Date: Thu, 9 Jan 2025 21:51:03 +0000
Subject: [PATCH] Fix enum templates not compatible with Solaris compiler

Signed-off-by: Evgeny Malygin <emalygin@bloomberg.net>
---
 src/groups/mqb/mqbstat/mqbstat_brokerstats.h  | 12 ++---
 src/groups/mqb/mqbstat/mqbstat_clusterstats.h | 12 ++---
 src/groups/mqb/mqbstat/mqbstat_domainstats.h  |  6 +--
 src/groups/mqb/mqbstat/mqbstat_queuestats.h   | 45 ++++++++-----------
 4 files changed, 29 insertions(+), 46 deletions(-)

diff --git a/src/groups/mqb/mqbstat/mqbstat_brokerstats.h b/src/groups/mqb/mqbstat/mqbstat_brokerstats.h
index 005e7c018..25feafb83 100644
--- a/src/groups/mqb/mqbstat/mqbstat_brokerstats.h
+++ b/src/groups/mqb/mqbstat/mqbstat_brokerstats.h
@@ -165,8 +165,7 @@ inline bmqst::StatContext* BrokerStats::statContext()
 }
 
 template <>
-inline void
-BrokerStats::onEvent<BrokerStats::EventType::Enum::e_CLIENT_CREATED>()
+inline void BrokerStats::onEvent<BrokerStats::EventType::e_CLIENT_CREATED>()
 {
     BSLS_ASSERT_SAFE(d_statContext_p && "initialize was not called");
 
@@ -174,8 +173,7 @@ BrokerStats::onEvent<BrokerStats::EventType::Enum::e_CLIENT_CREATED>()
 }
 
 template <>
-inline void
-BrokerStats::onEvent<BrokerStats::EventType::Enum::e_CLIENT_DESTROYED>()
+inline void BrokerStats::onEvent<BrokerStats::EventType::e_CLIENT_DESTROYED>()
 {
     BSLS_ASSERT_SAFE(d_statContext_p && "initialize was not called");
 
@@ -183,8 +181,7 @@ BrokerStats::onEvent<BrokerStats::EventType::Enum::e_CLIENT_DESTROYED>()
 }
 
 template <>
-inline void
-BrokerStats::onEvent<BrokerStats::EventType::Enum::e_QUEUE_CREATED>()
+inline void BrokerStats::onEvent<BrokerStats::EventType::e_QUEUE_CREATED>()
 {
     BSLS_ASSERT_SAFE(d_statContext_p && "initialize was not called");
 
@@ -192,8 +189,7 @@ BrokerStats::onEvent<BrokerStats::EventType::Enum::e_QUEUE_CREATED>()
 }
 
 template <>
-inline void
-BrokerStats::onEvent<BrokerStats::EventType::Enum::e_QUEUE_DESTROYED>()
+inline void BrokerStats::onEvent<BrokerStats::EventType::e_QUEUE_DESTROYED>()
 {
     BSLS_ASSERT_SAFE(d_statContext_p && "initialize was not called");
 
diff --git a/src/groups/mqb/mqbstat/mqbstat_clusterstats.h b/src/groups/mqb/mqbstat/mqbstat_clusterstats.h
index 3d7d5f78c..1707fb985 100644
--- a/src/groups/mqb/mqbstat/mqbstat_clusterstats.h
+++ b/src/groups/mqb/mqbstat/mqbstat_clusterstats.h
@@ -418,32 +418,28 @@ inline bmqst::StatContext* ClusterNodeStats::statContext()
 }
 
 template <>
-inline void
-ClusterNodeStats::onEvent<ClusterNodeStats::EventType::Enum::e_ACK>(
+inline void ClusterNodeStats::onEvent<ClusterNodeStats::EventType::e_ACK>(
     BSLS_ANNOTATION_UNUSED bsls::Types::Int64 value)
 {
     d_statContext_mp->adjustValue(ClusterNodeStatsIndex::e_STAT_ACK, 1);
 }
 
 template <>
-inline void
-ClusterNodeStats::onEvent<ClusterNodeStats::EventType::Enum::e_CONFIRM>(
+inline void ClusterNodeStats::onEvent<ClusterNodeStats::EventType::e_CONFIRM>(
     BSLS_ANNOTATION_UNUSED bsls::Types::Int64 value)
 {
     d_statContext_mp->adjustValue(ClusterNodeStatsIndex::e_STAT_CONFIRM, 1);
 }
 
 template <>
-inline void
-ClusterNodeStats::onEvent<ClusterNodeStats::EventType::Enum::e_PUSH>(
+inline void ClusterNodeStats::onEvent<ClusterNodeStats::EventType::e_PUSH>(
     bsls::Types::Int64 value)
 {
     d_statContext_mp->adjustValue(ClusterNodeStatsIndex::e_STAT_PUSH, value);
 }
 
 template <>
-inline void
-ClusterNodeStats::onEvent<ClusterNodeStats::EventType::Enum::e_PUT>(
+inline void ClusterNodeStats::onEvent<ClusterNodeStats::EventType::e_PUT>(
     bsls::Types::Int64 value)
 {
     d_statContext_mp->adjustValue(ClusterNodeStatsIndex::e_STAT_PUT, value);
diff --git a/src/groups/mqb/mqbstat/mqbstat_domainstats.h b/src/groups/mqb/mqbstat/mqbstat_domainstats.h
index 8f19a4d81..c57ae7bb7 100644
--- a/src/groups/mqb/mqbstat/mqbstat_domainstats.h
+++ b/src/groups/mqb/mqbstat/mqbstat_domainstats.h
@@ -157,7 +157,7 @@ inline bmqst::StatContext* DomainStats::statContext()
 }
 
 template <>
-inline void DomainStats::onEvent<DomainStats::EventType::Enum::e_CFG_MSGS>(
+inline void DomainStats::onEvent<DomainStats::EventType::e_CFG_MSGS>(
     bsls::Types::Int64 value)
 {
     BSLS_ASSERT_SAFE(d_statContext_mp && "initialize was not called");
@@ -165,7 +165,7 @@ inline void DomainStats::onEvent<DomainStats::EventType::Enum::e_CFG_MSGS>(
 }
 
 template <>
-inline void DomainStats::onEvent<DomainStats::EventType::Enum::e_CFG_BYTES>(
+inline void DomainStats::onEvent<DomainStats::EventType::e_CFG_BYTES>(
     bsls::Types::Int64 value)
 {
     BSLS_ASSERT_SAFE(d_statContext_mp && "initialize was not called");
@@ -173,7 +173,7 @@ inline void DomainStats::onEvent<DomainStats::EventType::Enum::e_CFG_BYTES>(
 }
 
 template <>
-inline void DomainStats::onEvent<DomainStats::EventType::Enum::e_QUEUE_COUNT>(
+inline void DomainStats::onEvent<DomainStats::EventType::e_QUEUE_COUNT>(
     bsls::Types::Int64 value)
 {
     BSLS_ASSERT_SAFE(d_statContext_mp && "initialize was not called");
diff --git a/src/groups/mqb/mqbstat/mqbstat_queuestats.h b/src/groups/mqb/mqbstat/mqbstat_queuestats.h
index d6fcd8e5b..ad3ae5869 100644
--- a/src/groups/mqb/mqbstat/mqbstat_queuestats.h
+++ b/src/groups/mqb/mqbstat/mqbstat_queuestats.h
@@ -527,8 +527,7 @@ inline bmqst::StatContext* QueueStatsDomain::statContext()
 }
 
 template <>
-inline void
-QueueStatsDomain::onEvent<QueueStatsDomain::EventType::Enum::e_ACK>(
+inline void QueueStatsDomain::onEvent<QueueStatsDomain::EventType::e_ACK>(
     BSLS_ANNOTATION_UNUSED bsls::Types::Int64 value)
 {
     BSLS_ASSERT_SAFE(d_statContext_mp && "initialize was not called");
@@ -536,8 +535,7 @@ QueueStatsDomain::onEvent<QueueStatsDomain::EventType::Enum::e_ACK>(
 }
 
 template <>
-inline void
-QueueStatsDomain::onEvent<QueueStatsDomain::EventType::Enum::e_ACK_TIME>(
+inline void QueueStatsDomain::onEvent<QueueStatsDomain::EventType::e_ACK_TIME>(
     bsls::Types::Int64 value)
 {
     BSLS_ASSERT_SAFE(d_statContext_mp && "initialize was not called");
@@ -545,8 +543,7 @@ QueueStatsDomain::onEvent<QueueStatsDomain::EventType::Enum::e_ACK_TIME>(
 }
 
 template <>
-inline void
-QueueStatsDomain::onEvent<QueueStatsDomain::EventType::Enum::e_NACK>(
+inline void QueueStatsDomain::onEvent<QueueStatsDomain::EventType::e_NACK>(
     BSLS_ANNOTATION_UNUSED bsls::Types::Int64 value)
 {
     BSLS_ASSERT_SAFE(d_statContext_mp && "initialize was not called");
@@ -555,8 +552,7 @@ QueueStatsDomain::onEvent<QueueStatsDomain::EventType::Enum::e_NACK>(
 }
 
 template <>
-inline void
-QueueStatsDomain::onEvent<QueueStatsDomain::EventType::Enum::e_CONFIRM>(
+inline void QueueStatsDomain::onEvent<QueueStatsDomain::EventType::e_CONFIRM>(
     BSLS_ANNOTATION_UNUSED bsls::Types::Int64 value)
 {
     BSLS_ASSERT_SAFE(d_statContext_mp && "initialize was not called");
@@ -566,7 +562,7 @@ QueueStatsDomain::onEvent<QueueStatsDomain::EventType::Enum::e_CONFIRM>(
 
 template <>
 inline void
-QueueStatsDomain::onEvent<QueueStatsDomain::EventType::Enum::e_CONFIRM_TIME>(
+QueueStatsDomain::onEvent<QueueStatsDomain::EventType::e_CONFIRM_TIME>(
     bsls::Types::Int64 value)
 {
     BSLS_ASSERT_SAFE(d_statContext_mp && "initialize was not called");
@@ -575,8 +571,7 @@ QueueStatsDomain::onEvent<QueueStatsDomain::EventType::Enum::e_CONFIRM_TIME>(
 }
 
 template <>
-inline void
-QueueStatsDomain::onEvent<QueueStatsDomain::EventType::Enum::e_REJECT>(
+inline void QueueStatsDomain::onEvent<QueueStatsDomain::EventType::e_REJECT>(
     BSLS_ANNOTATION_UNUSED bsls::Types::Int64 value)
 {
     BSLS_ASSERT_SAFE(d_statContext_mp && "initialize was not called");
@@ -586,7 +581,7 @@ QueueStatsDomain::onEvent<QueueStatsDomain::EventType::Enum::e_REJECT>(
 
 template <>
 inline void
-QueueStatsDomain::onEvent<QueueStatsDomain::EventType::Enum::e_QUEUE_TIME>(
+QueueStatsDomain::onEvent<QueueStatsDomain::EventType::e_QUEUE_TIME>(
     bsls::Types::Int64 value)
 {
     BSLS_ASSERT_SAFE(d_statContext_mp && "initialize was not called");
@@ -594,8 +589,7 @@ QueueStatsDomain::onEvent<QueueStatsDomain::EventType::Enum::e_QUEUE_TIME>(
 }
 
 template <>
-inline void
-QueueStatsDomain::onEvent<QueueStatsDomain::EventType::Enum::e_PUSH>(
+inline void QueueStatsDomain::onEvent<QueueStatsDomain::EventType::e_PUSH>(
     bsls::Types::Int64 value)
 {
     BSLS_ASSERT_SAFE(d_statContext_mp && "initialize was not called");
@@ -603,8 +597,7 @@ QueueStatsDomain::onEvent<QueueStatsDomain::EventType::Enum::e_PUSH>(
 }
 
 template <>
-inline void
-QueueStatsDomain::onEvent<QueueStatsDomain::EventType::Enum::e_PUT>(
+inline void QueueStatsDomain::onEvent<QueueStatsDomain::EventType::e_PUT>(
     bsls::Types::Int64 value)
 {
     BSLS_ASSERT_SAFE(d_statContext_mp && "initialize was not called");
@@ -613,7 +606,7 @@ QueueStatsDomain::onEvent<QueueStatsDomain::EventType::Enum::e_PUT>(
 
 template <>
 inline void
-QueueStatsDomain::onEvent<QueueStatsDomain::EventType::Enum::e_ADD_MESSAGE>(
+QueueStatsDomain::onEvent<QueueStatsDomain::EventType::e_ADD_MESSAGE>(
     bsls::Types::Int64 value)
 {
     BSLS_ASSERT_SAFE(d_statContext_mp && "initialize was not called");
@@ -631,7 +624,7 @@ QueueStatsDomain::onEvent<QueueStatsDomain::EventType::Enum::e_ADD_MESSAGE>(
 
 template <>
 inline void
-QueueStatsDomain::onEvent<QueueStatsDomain::EventType::Enum::e_DEL_MESSAGE>(
+QueueStatsDomain::onEvent<QueueStatsDomain::EventType::e_DEL_MESSAGE>(
     bsls::Types::Int64 value)
 {
     BSLS_ASSERT_SAFE(d_statContext_mp && "initialize was not called");
@@ -641,7 +634,7 @@ QueueStatsDomain::onEvent<QueueStatsDomain::EventType::Enum::e_DEL_MESSAGE>(
 
 template <>
 inline void
-QueueStatsDomain::onEvent<QueueStatsDomain::EventType::Enum::e_GC_MESSAGE>(
+QueueStatsDomain::onEvent<QueueStatsDomain::EventType::e_GC_MESSAGE>(
     bsls::Types::Int64 value)
 {
     BSLS_ASSERT_SAFE(d_statContext_mp && "initialize was not called");
@@ -649,8 +642,7 @@ QueueStatsDomain::onEvent<QueueStatsDomain::EventType::Enum::e_GC_MESSAGE>(
 }
 
 template <>
-inline void
-QueueStatsDomain::onEvent<QueueStatsDomain::EventType::Enum::e_PURGE>(
+inline void QueueStatsDomain::onEvent<QueueStatsDomain::EventType::e_PURGE>(
     BSLS_ANNOTATION_UNUSED bsls::Types::Int64 value)
 {
     BSLS_ASSERT_SAFE(d_statContext_mp && "initialize was not called");
@@ -670,7 +662,7 @@ QueueStatsDomain::onEvent<QueueStatsDomain::EventType::Enum::e_PURGE>(
 
 template <>
 inline void
-QueueStatsDomain::onEvent<QueueStatsDomain::EventType::Enum::e_CHANGE_ROLE>(
+QueueStatsDomain::onEvent<QueueStatsDomain::EventType::e_CHANGE_ROLE>(
     bsls::Types::Int64 value)
 {
     BSLS_ASSERT_SAFE(d_statContext_mp && "initialize was not called");
@@ -678,8 +670,7 @@ QueueStatsDomain::onEvent<QueueStatsDomain::EventType::Enum::e_CHANGE_ROLE>(
 }
 
 template <>
-inline void
-QueueStatsDomain::onEvent<QueueStatsDomain::EventType::Enum::e_CFG_MSGS>(
+inline void QueueStatsDomain::onEvent<QueueStatsDomain::EventType::e_CFG_MSGS>(
     bsls::Types::Int64 value)
 {
     BSLS_ASSERT_SAFE(d_statContext_mp && "initialize was not called");
@@ -688,7 +679,7 @@ QueueStatsDomain::onEvent<QueueStatsDomain::EventType::Enum::e_CFG_MSGS>(
 
 template <>
 inline void
-QueueStatsDomain::onEvent<QueueStatsDomain::EventType::Enum::e_CFG_BYTES>(
+QueueStatsDomain::onEvent<QueueStatsDomain::EventType::e_CFG_BYTES>(
     bsls::Types::Int64 value)
 {
     BSLS_ASSERT_SAFE(d_statContext_mp && "initialize was not called");
@@ -697,7 +688,7 @@ QueueStatsDomain::onEvent<QueueStatsDomain::EventType::Enum::e_CFG_BYTES>(
 
 template <>
 inline void
-QueueStatsDomain::onEvent<QueueStatsDomain::EventType::Enum::e_NO_SC_MESSAGE>(
+QueueStatsDomain::onEvent<QueueStatsDomain::EventType::e_NO_SC_MESSAGE>(
     bsls::Types::Int64 value)
 {
     BSLS_ASSERT_SAFE(d_statContext_mp && "initialize was not called");
@@ -706,7 +697,7 @@ QueueStatsDomain::onEvent<QueueStatsDomain::EventType::Enum::e_NO_SC_MESSAGE>(
 
 template <>
 inline void
-QueueStatsDomain::onEvent<QueueStatsDomain::EventType::Enum::e_UPDATE_HISTORY>(
+QueueStatsDomain::onEvent<QueueStatsDomain::EventType::e_UPDATE_HISTORY>(
     bsls::Types::Int64 value)
 {
     BSLS_ASSERT_SAFE(d_statContext_mp && "initialize was not called");