summaryrefslogtreecommitdiff
path: root/TAO
diff options
context:
space:
mode:
authorlevine <levine@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>1998-10-20 20:07:59 +0000
committerlevine <levine@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>1998-10-20 20:07:59 +0000
commit9a7499bf6fb2ed4080b4c4aa886d218b622ce356 (patch)
tree33831cc2eb918664fbc0d8655012d35b1e2a783d /TAO
parent1294c0501bf0e204c5366594e08e1b13ed229159 (diff)
downloadATCD-9a7499bf6fb2ed4080b4c4aa886d218b622ce356.tar.gz
(get_extractor): moved return statement inside of ACE_LACKS_LONGLONG_T
protection to avoid compiler warning about unreachable statement.
Diffstat (limited to 'TAO')
-rw-r--r--TAO/tao/DynUnion_i.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/TAO/tao/DynUnion_i.cpp b/TAO/tao/DynUnion_i.cpp
index 30ff2106803..588de2c1875 100644
--- a/TAO/tao/DynUnion_i.cpp
+++ b/TAO/tao/DynUnion_i.cpp
@@ -1293,16 +1293,17 @@ TAO_DynUnion_i::get_extractor (CORBA::TCKind kind,
0);
return retval;
-// For Chorus and VxWorks
+// For platforms without native 64-bit ints . . .
#if !defined (ACE_LACKS_LONGLONG_T)
case CORBA::tk_longlong:
ACE_NEW_THROW_RETURN (retval,
::DU_Extractor<CORBA::LongLong>,
CORBA::NO_MEMORY (CORBA::COMPLETED_NO),
0);
-#endif /* ACE_LACKS_LONGLONG_T */
return retval;
+#endif /* ACE_LACKS_LONGLONG_T */
+
case CORBA::tk_ulonglong:
ACE_NEW_THROW_RETURN (retval,
::DU_Extractor<CORBA::ULongLong>,
@@ -1410,7 +1411,7 @@ template class DU_Extractor<CORBA::ULong>;
template class DU_Extractor<CORBA::Boolean>;
template class DU_Extractor<CORBA::Char>;
-// For Chorus and VxWorks
+// For platforms without native 64-bit ints . . .
#if !defined (ACE_LACKS_LONGLONG_T)
template class DU_Extractor<CORBA::LongLong>;
#endif /* ACE_LACKS_LONGLONG_T */
@@ -1424,11 +1425,10 @@ template class DU_Extractor<CORBA::ULongLong>;
#pragma instantiate DU_Extractor<CORBA::Boolean>
#pragma instantiate DU_Extractor<CORBA::Char>
-// For Chorus and VxWorks
+// For platforms without native 64-bit ints . . .
#if !defined (ACE_LACKS_LONGLONG_T)
#pragma instantiate DU_Extractor<CORBA::LongLong>
#endif /* ACE_LACKS_LONGLONG_T */
#pragma instantiate DU_Extractor<CORBA::ULongLong>
#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-