diff --git a/ridlbe/c++11/templates/cli/src/bitmask_cdr.erb b/ridlbe/c++11/templates/cli/src/bitmask_cdr.erb
index 2d2f8a77..8785e273 100644
--- a/ridlbe/c++11/templates/cli/src/bitmask_cdr.erb
+++ b/ridlbe/c++11/templates/cli/src/bitmask_cdr.erb
@@ -11,7 +11,7 @@ TAO_CORBA::Boolean operator<< (TAO_OutputCDR &strm, const <%= scoped_cxxname %>
 
 TAO_CORBA::Boolean operator>> (TAO_InputCDR &strm, <%= scoped_cxxname %> &_tao_bitmask)
 {
-  <%= bitbound.cxx_member_type %> _tao_temp <%= bitbound.value_initializer %>;
+  std::underlying_type_t<<%= scoped_cxxname %>> _tao_temp <%= bitbound.value_initializer %>;
   bool const _tao_success = strm >> <%= bitbound.cdr_to_fmt % "_tao_temp" %>;
 
   if (_tao_success)
diff --git a/ridlbe/c++11/templates/cli/src/bitset_cdr.erb b/ridlbe/c++11/templates/cli/src/bitset_cdr.erb
index fcb97148..a4eae738 100644
--- a/ridlbe/c++11/templates/cli/src/bitset_cdr.erb
+++ b/ridlbe/c++11/templates/cli/src/bitset_cdr.erb
@@ -9,7 +9,7 @@ TAO_CORBA::Boolean operator<< (TAO_OutputCDR &/*strm*/, const <%= scoped_cxxname
 TAO_CORBA::Boolean operator>> (TAO_InputCDR &/*strm*/, <%= scoped_cxxname %> & /*_tao_bitset*/)
 {
   return true;
-%#  <%= bitbound.cxx_member_type %> _tao_temp <%= bitbound.value_initializer %>;
+%#  std::underlying_type_t<<%= scoped_cxxname %>> _tao_temp <%= bitbound.value_initializer %>;
 %#  bool const _tao_success = strm >> <%= bitbound.cdr_to_fmt % "_tao_temp" %>;
 %#
 %#  if (_tao_success)
diff --git a/ridlbe/c++11/templates/cli/src/enum_cdr.erb b/ridlbe/c++11/templates/cli/src/enum_cdr.erb
index 10e897a2..1331512a 100644
--- a/ridlbe/c++11/templates/cli/src/enum_cdr.erb
+++ b/ridlbe/c++11/templates/cli/src/enum_cdr.erb
@@ -11,7 +11,7 @@ TAO_CORBA::Boolean operator<< (TAO_OutputCDR &strm, const <%= scoped_cxxname %>
 
 TAO_CORBA::Boolean operator>> (TAO_InputCDR &strm, <%= scoped_cxxname %> &_tao_enumerator)
 {
-  <%= bitbound.cxx_member_type %> _tao_temp <%= bitbound.value_initializer %>;
+  std::underlying_type_t<<%= scoped_cxxname %>> _tao_temp <%= bitbound.value_initializer %>;
   bool const _tao_success = strm >> <%= bitbound.cdr_to_fmt % "_tao_temp" %>;
 
   if (_tao_success)