diff options
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/Basic_Types_Test.cpp | 8 | ||||
| -rw-r--r-- | tests/Handle_Set_Test.cpp | 10 |
2 files changed, 5 insertions, 13 deletions
diff --git a/tests/Basic_Types_Test.cpp b/tests/Basic_Types_Test.cpp index de8bf8d898c..437c9df0bbc 100644 --- a/tests/Basic_Types_Test.cpp +++ b/tests/Basic_Types_Test.cpp @@ -118,18 +118,10 @@ main (int, ASYS_TCHAR *[]) errors += check (ASYS_TEXT ("sizeof (ACE_UINT16) is %u%s"), sizeof (ACE_INT16), 2); #else /* ! _UNICOS */ - // MPP Crays have 32 bit shorts, so we use those for 16 bit quantities -# if defined(_CRAYMPP) - errors += check (ASYS_TEXT ("sizeof (ACE_INT16) is %u%s"), - sizeof (ACE_INT16), 4); - errors += check (ASYS_TEXT ("sizeof (ACE_UINT16) is %u%s"), - sizeof (ACE_INT16), 4); -# else errors += check (ASYS_TEXT ("sizeof (ACE_INT16) is %u%s"), sizeof (ACE_INT16), 8); errors += check (ASYS_TEXT ("sizeof (ACE_UINT16) is %u%s"), sizeof (ACE_INT16), 8); -# endif #endif /* ! _UNICOS */ // MPP Crays do have 32-bit quantities (short), though vector Crays don't diff --git a/tests/Handle_Set_Test.cpp b/tests/Handle_Set_Test.cpp index ee4c6c25f7a..7529ae8a9a1 100644 --- a/tests/Handle_Set_Test.cpp +++ b/tests/Handle_Set_Test.cpp @@ -208,13 +208,13 @@ main (int argc, ASYS_TCHAR *argv[]) // The ACE_Node<ACE_INT32> instantation is in ace/Stats.cpp. template class ACE_Unbounded_Set<ACE_HANDLE>; template class ACE_Unbounded_Set_Iterator<ACE_HANDLE>; -#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -// The ACE_Node<ACE_INT32> instantation is in ace/Stats.cpp. -#pragma instantiate ACE_Unbounded_Set<ACE_HANDLE> -#pragma instantiate ACE_Unbounded_Set_Iterator<ACE_HANDLE> # if defined(_CRAYMPP) // MPP Cray ACE_HANDLE is 64-bit, defined as int, but ACE_INT32 is short // so instantiation in ace/Stats.cpp isn't used in this case -#pragma instantiate ACE_Node<ACE_HANDLE> +template class ACE_Node<ACE_HANDLE>; # endif +#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) +// The ACE_Node<ACE_INT32> instantation is in ace/Stats.cpp. +#pragma instantiate ACE_Unbounded_Set<ACE_HANDLE> +#pragma instantiate ACE_Unbounded_Set_Iterator<ACE_HANDLE> #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ |