From e8482067cc0d8f0a136bbd81999d330a93b71586 Mon Sep 17 00:00:00 2001 From: schmidt Date: Mon, 7 Jun 1999 05:51:25 +0000 Subject: . --- tests/Env_Value_Test.cpp | 10 +++---- tests/Hash_Map_Manager_Test.cpp | 66 +++++++++++++++++++++-------------------- tests/Map_Manager_Test.cpp | 11 ++++--- 3 files changed, 46 insertions(+), 41 deletions(-) (limited to 'tests') diff --git a/tests/Env_Value_Test.cpp b/tests/Env_Value_Test.cpp index 9147e71d335..44a9c94e80a 100644 --- a/tests/Env_Value_Test.cpp +++ b/tests/Env_Value_Test.cpp @@ -10,7 +10,7 @@ // working correctly. // // = AUTHOR -// Chris Cleeland +// Chris Cleeland // // ============================================================================ @@ -101,8 +101,8 @@ main (int argc, LPTSTR [], LPTSTR envp[]) TEST_THIS (short, "TEST_VALUE_NEGATIVE", 0, -10); TEST_THIS (unsigned short, "TEST_VALUE_NEGATIVE", 0, (unsigned short) -10); - char *defstr = "Sarah Cleeland is Two!"; - ACE_Env_Value sval ("This_Shouldnt_Be_Set_Hopefully", + const char *defstr = "Sarah Cleeland is Two!"; + ACE_Env_Value sval ("This_Shouldnt_Be_Set_Hopefully", defstr); ACE_ASSERT (ACE_OS::strcmp (sval, defstr) == 0); ACE_END_TEST; @@ -110,7 +110,7 @@ main (int argc, LPTSTR [], LPTSTR envp[]) return 0; } #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) - template class ACE_Env_Value; + template class ACE_Env_Value; # if !defined (ACE_LACKS_FLOATING_POINT) template class ACE_Env_Value; # endif /* ! ACE_LACKS_FLOATING_POINT */ @@ -120,7 +120,7 @@ main (int argc, LPTSTR [], LPTSTR envp[]) template class ACE_Env_Value; template class ACE_Env_Value; #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -# pragma instantiate ACE_Env_Value +# pragma instantiate ACE_Env_Value # if !defined (ACE_LACKS_FLOATING_POINT) # pragma instantiate ACE_Env_Value # endif /* ! ACE_LACKS_FLOATING_POINT */ diff --git a/tests/Hash_Map_Manager_Test.cpp b/tests/Hash_Map_Manager_Test.cpp index 3554abe784e..8e91fe5eba7 100644 --- a/tests/Hash_Map_Manager_Test.cpp +++ b/tests/Hash_Map_Manager_Test.cpp @@ -15,7 +15,8 @@ // conjunction with the . // // = AUTHOR -// James Hu and Douglas C. Schmidt +// James Hu and +// Douglas C. Schmidt // // ============================================================================ @@ -31,25 +32,25 @@ USELIB("..\ace\aced.lib"); //--------------------------------------------------------------------------- #endif /* defined(__BORLANDC__) && __BORLANDC__ >= 0x0530 */ -typedef ACE_Hash_Map_Entry HASH_STRING_ENTRY; +typedef ACE_Hash_Map_Entry HASH_STRING_ENTRY; -typedef ACE_Hash_Map_Manager_Ex, - ACE_Equal_To, +typedef ACE_Hash_Map_Manager_Ex, + ACE_Equal_To, ACE_Null_Mutex> HASH_STRING_MAP; -typedef ACE_Hash_Map_Iterator_Ex, - ACE_Equal_To, +typedef ACE_Hash_Map_Iterator_Ex, + ACE_Equal_To, ACE_Null_Mutex> HASH_STRING_ITER; -typedef ACE_Hash_Map_Reverse_Iterator_Ex, - ACE_Equal_To, +typedef ACE_Hash_Map_Reverse_Iterator_Ex, + ACE_Equal_To, ACE_Null_Mutex> HASH_STRING_REVERSE_ITER; struct String_Table @@ -84,7 +85,8 @@ static const size_t MAX_HASH = 6; // @@ The following requires too much internal implementation // information about the . We need to figure // out how to simplify this. -static const size_t String_Table_size = sizeof (HASH_STRING_ENTRY) * (STRING_TABLE_SIZE + MAX_HASH); +static const size_t String_Table_size = + sizeof (HASH_STRING_ENTRY) * (STRING_TABLE_SIZE + MAX_HASH); static ACE_Static_Allocator alloc; static int @@ -105,7 +107,7 @@ run_test (void) ASYS_TEXT ("bind"), string_table[i].key_), -1); - ASYS_TCHAR *entry; + LPCTSTR entry; // Check the operation. for (i = 0; string_table[i].key_ != 0; i++) @@ -123,7 +125,7 @@ run_test (void) // Check the operation. { - ASYS_TCHAR *pc = string_table[1].value_; + LPCTSTR pc = string_table[1].value_; if (hash.trybind (string_table[0].key_, pc) != 1) ACE_ERROR_RETURN ((LM_ERROR, @@ -147,8 +149,8 @@ run_test (void) ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("iterating (%d): [%s, %s]\n"), i, - (ASYS_TCHAR *) entry->ext_id_, - (ASYS_TCHAR *) entry->int_id_)); + (LPCTSTR) entry->ext_id_, + (LPCTSTR) entry->int_id_)); i++; } } @@ -181,8 +183,8 @@ run_test (void) ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("iterating (%d): [%s, %s]\n"), i, - (ASYS_TCHAR *) entry->ext_id_, - (ASYS_TCHAR *) entry->int_id_)); + (LPCTSTR) entry->ext_id_, + (LPCTSTR) entry->int_id_)); i++; } } @@ -204,17 +206,17 @@ main (int, ASYS_TCHAR *[]) } #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) -template class ACE_Hash_Map_Entry; -template class ACE_Hash_Map_Manager_Ex, ACE_Equal_To, ACE_Null_Mutex>; -template class ACE_Hash_Map_Iterator_Base_Ex, ACE_Equal_To, ACE_Null_Mutex>; -template class ACE_Hash_Map_Iterator_Ex, ACE_Equal_To, ACE_Null_Mutex>; -template class ACE_Hash_Map_Reverse_Iterator_Ex, ACE_Equal_To, ACE_Null_Mutex>; +template class ACE_Hash_Map_Entry; +template class ACE_Hash_Map_Manager_Ex, ACE_Equal_To, ACE_Null_Mutex>; +template class ACE_Hash_Map_Iterator_Base_Ex, ACE_Equal_To, ACE_Null_Mutex>; +template class ACE_Hash_Map_Iterator_Ex, ACE_Equal_To, ACE_Null_Mutex>; +template class ACE_Hash_Map_Reverse_Iterator_Ex, ACE_Equal_To, ACE_Null_Mutex>; template class ACE_Static_Allocator; #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -#pragma instantiate ACE_Hash_Map_Entry -#pragma instantiate ACE_Hash_Map_Manager_Ex, ACE_Equal_To, ACE_Null_Mutex> -#pragma instantiate ACE_Hash_Map_Iterator_Base_Ex, ACE_Equal_To, ACE_Null_Mutex> -#pragma instantiate ACE_Hash_Map_Iterator_Ex, ACE_Equal_To, ACE_Null_Mutex> -#pragma instantiate ACE_Hash_Map_Reverse_Iterator_Ex, ACE_Equal_To, ACE_Null_Mutex> +#pragma instantiate ACE_Hash_Map_Entry +#pragma instantiate ACE_Hash_Map_Manager_Ex, ACE_Equal_To, ACE_Null_Mutex> +#pragma instantiate ACE_Hash_Map_Iterator_Base_Ex, ACE_Equal_To, ACE_Null_Mutex> +#pragma instantiate ACE_Hash_Map_Iterator_Ex, ACE_Equal_To, ACE_Null_Mutex> +#pragma instantiate ACE_Hash_Map_Reverse_Iterator_Ex, ACE_Equal_To, ACE_Null_Mutex> #pragma instantiate ACE_Static_Allocator #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/tests/Map_Manager_Test.cpp b/tests/Map_Manager_Test.cpp index a40acf9e419..70dcf6cb412 100644 --- a/tests/Map_Manager_Test.cpp +++ b/tests/Map_Manager_Test.cpp @@ -129,7 +129,7 @@ test_active_map_manager (size_t table_size, ACE_ASSERT (map.current_size () == remaining_entries); } - delete[] active_keys; + delete [] active_keys; } static void @@ -552,11 +552,14 @@ run_test (void (*ptf) (size_t, size_t, int), timer.elapsed_time (et); - ASYS_TCHAR *test_iterators_string = 0; + LPCTSTR test_iterators_string = 0; + if (test_iterators) - test_iterators_string = ASYS_TEXT ("includes executing iterators"); + test_iterators_string = + ASYS_TEXT ("includes executing iterators"); else - test_iterators_string = ASYS_TEXT ("doesn't include executing iterators"); + test_iterators_string = + ASYS_TEXT ("doesn't include executing iterators"); ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("time to test a map of size %d for %d iterations using %s (%s)\n"), -- cgit v1.2.1