Merge pull request #394 from jwillemsen/jwi-stdtounderlying

Make use of std::to_underlying when we have C++23
RemedyIT · Aug 5, 2024 · 9462b66 · 9462b66
2 parents 1d69715 + 8b7b1f3
commit 9462b66
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/ridlbe/c++11/templates/cli/src/bitmask_cdr.erb b/ridlbe/c++11/templates/cli/src/bitmask_cdr.erb
@@ -2,7 +2,11 @@
 // generated from <%= ridl_template_path %>
 TAO_CORBA::Boolean operator<< (TAO_OutputCDR &strm, const <%= scoped_cxxname %> &_tao_bitmask)
 {
+#if defined (ACE_HAS_CPP23)
+  return strm << std::to_underlying (_tao_bitmask);
+#else
   return strm << static_cast<<%= bitbound.cxx_type %>> (_tao_bitmask);
+#endif
 }
 
 TAO_CORBA::Boolean operator>> (TAO_InputCDR &strm, <%= scoped_cxxname %> &_tao_bitmask)

diff --git a/ridlbe/c++11/templates/cli/src/enum_cdr.erb b/ridlbe/c++11/templates/cli/src/enum_cdr.erb
@@ -2,7 +2,11 @@
 // generated from <%= ridl_template_path %>
 TAO_CORBA::Boolean operator<< (TAO_OutputCDR &strm, const <%= scoped_cxxname %> &_tao_enumerator)
 {
+#if defined (ACE_HAS_CPP23)
+  return strm << std::to_underlying (_tao_enumerator);
+#else
   return strm << static_cast<<%= bitbound.cxx_type %>> (_tao_enumerator);
+#endif
 }
 
 TAO_CORBA::Boolean operator>> (TAO_InputCDR &strm, <%= scoped_cxxname %> &_tao_enumerator)