ChangeLogTag:Wed Dec 5 12:15:36 2001 Carlos O'Ryan <coryan@uci.edu>

7 files changed, 115 insertions, 45 deletions

diff --git a/ChangeLog b/ChangeLog
index a5a03a0e099..70e208eb583 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,22 @@
+Wed Dec  5 12:15:36 2001  Carlos O'Ryan  <coryan@uci.edu>
+
+	* ace/SString.cpp:
+	  Add missing template instantiations, only a problem when
+	  inlining was disabled.
+
+	* tests/Hash_Map_Manager_Test.cpp:
+	  Rename global variable 'alloc' to 'ace_test_allocator', the
+	  former conflicts with STL symbols under Linux.
+
+	* tests/Map_Test.cpp:
+	  Rename the value_type and expanded_value global typedefs to have
+	  an ace_ prefix.  Though only used in this test they conflict
+	  with some STL symbols by the same name.
+
+	* tests/DLList_Test.cpp:
+	  Remove unused global variable 'alloc' looks like a cut&paste
+	  carry-over.
+
 Wed Dec 05 10:08:56 2001  Carlos O'Ryan  <coryan@uci.edu>
 
 	* rpc++/*:
diff --git a/ChangeLogs/ChangeLog-02a b/ChangeLogs/ChangeLog-02a
index a5a03a0e099..70e208eb583 100644
--- a/ChangeLogs/ChangeLog-02a
+++ b/ChangeLogs/ChangeLog-02a
@@ -1,3 +1,22 @@
+Wed Dec  5 12:15:36 2001  Carlos O'Ryan  <coryan@uci.edu>
+
+	* ace/SString.cpp:
+	  Add missing template instantiations, only a problem when
+	  inlining was disabled.
+
+	* tests/Hash_Map_Manager_Test.cpp:
+	  Rename global variable 'alloc' to 'ace_test_allocator', the
+	  former conflicts with STL symbols under Linux.
+
+	* tests/Map_Test.cpp:
+	  Rename the value_type and expanded_value global typedefs to have
+	  an ace_ prefix.  Though only used in this test they conflict
+	  with some STL symbols by the same name.
+
+	* tests/DLList_Test.cpp:
+	  Remove unused global variable 'alloc' looks like a cut&paste
+	  carry-over.
+
 Wed Dec 05 10:08:56 2001  Carlos O'Ryan  <coryan@uci.edu>
 
 	* rpc++/*:
diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a
index a5a03a0e099..70e208eb583 100644
--- a/ChangeLogs/ChangeLog-03a
+++ b/ChangeLogs/ChangeLog-03a
@@ -1,3 +1,22 @@
+Wed Dec  5 12:15:36 2001  Carlos O'Ryan  <coryan@uci.edu>
+
+	* ace/SString.cpp:
+	  Add missing template instantiations, only a problem when
+	  inlining was disabled.
+
+	* tests/Hash_Map_Manager_Test.cpp:
+	  Rename global variable 'alloc' to 'ace_test_allocator', the
+	  former conflicts with STL symbols under Linux.
+
+	* tests/Map_Test.cpp:
+	  Rename the value_type and expanded_value global typedefs to have
+	  an ace_ prefix.  Though only used in this test they conflict
+	  with some STL symbols by the same name.
+
+	* tests/DLList_Test.cpp:
+	  Remove unused global variable 'alloc' looks like a cut&paste
+	  carry-over.
+
 Wed Dec 05 10:08:56 2001  Carlos O'Ryan  <coryan@uci.edu>
 
 	* rpc++/*:
diff --git a/ace/SString.cpp b/ace/SString.cpp
index 68c10cbcf0b..56c868ad529 100644
--- a/ace/SString.cpp
+++ b/ace/SString.cpp
@@ -524,8 +524,26 @@ ACE_SString::substring (size_t offset,
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 template class ACE_String_Base<char>;
+template ACE_String_Base<char> operator + (const ACE_String_Base<char> &,
+                                           const ACE_String_Base<char> &);
+template ACE_String_Base<char> operator + (const ACE_String_Base<char> &,
+                                           const char *);
+template ACE_String_Base<char> operator + (const char *,
+                                           const ACE_String_Base<char> &);
 template class ACE_String_Base<ACE_WSTRING_TYPE>;
+template ACE_String_Base<ACE_WSTRING_TYPE> operator + (const ACE_String_Base<ACE_WSTRING_TYPE> &,
+                                                       const ACE_String_Base<ACE_WSTRING_TYPE> &);
+template ACE_String_Base<ACE_WSTRING_TYPE> operator + (const ACE_String_Base<ACE_WSTRING_TYPE> &,
+                                                       const ACE_WSTRING_TYPE *);
+template ACE_String_Base<ACE_WSTRING_TYPE> operator + (const ACE_WSTRING_TYPE *,
+                                                       const ACE_String_Base<ACE_WSTRING_TYPE> &);
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
 #pragma instantiate ACE_String_Base<char>
+#pragma instantiate ACE_String_Base<char> operator + (const ACE_String_Base<char> &, const ACE_String_Base<char> &)
+#pragma instantiate ACE_String_Base<char> operator + (const ACE_String_Base<char> &, const char *)
+#pragma instantiate ACE_String_Base<char> operator + (const char *,ACE_String_Base<char> &)
 #pragma instantiate ACE_String_Base<ACE_WSTRING_TYPE>
+#pragma instantiate ACE_String_Base<ACE_WSTRING_TYPE> operator + (const ACE_String_Base<ACE_WSTRING_TYPE> &, const ACE_String_Base<ACE_WSTRING_TYPE> &)
+#pragma instantiate ACE_String_Base<ACE_WSTRING_TYPE> operator + (const ACE_String_Base<ACE_WSTRING_TYPE> &, const ACE_WSTRING_TYPE *)
+#pragma instantiate ACE_String_Base<ACE_WSTRING_TYPE> operator + (const ACE_WSTRING_TYPE *,ACE_String_Base<ACE_WSTRING_TYPE> &)
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/tests/DLList_Test.cpp b/tests/DLList_Test.cpp
index ea382e30bfd..b2c686aa03f 100644
--- a/tests/DLList_Test.cpp
+++ b/tests/DLList_Test.cpp
@@ -37,8 +37,6 @@ template class ACE_Static_Allocator<8192>;
 #pragma instantiate ACE_Static_Allocator<8192>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
-static ACE_Static_Allocator<8192> alloc;
-
 static ACE_STRING string_table[] =
 {
   // Note: all these casts are to appease SC 5.0 which is not pleased
@@ -72,8 +70,6 @@ run_iterate (STRLIST &list)
 static int
 run_test (void)
 {
-  alloc.dump ();
-
   STRLIST list;
 
   size_t i;
@@ -108,7 +104,6 @@ run_test (void)
 
   run_iterate (list);
 
-  alloc.dump ();
   return 0;
 }
 
diff --git a/tests/Hash_Map_Manager_Test.cpp b/tests/Hash_Map_Manager_Test.cpp
index e1af3bb4a43..9d80d58930e 100644
--- a/tests/Hash_Map_Manager_Test.cpp
+++ b/tests/Hash_Map_Manager_Test.cpp
@@ -59,7 +59,7 @@ template class ACE_Static_Allocator<STRING_TABLE_SIZE>;
 #pragma instantiate ACE_Static_Allocator<STRING_TABLE_SIZE>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
-static ACE_Static_Allocator<STRING_TABLE_SIZE> alloc;
+static ACE_Static_Allocator<STRING_TABLE_SIZE> ace_test_allocator;
 
 typedef ACE_Hash_Map_Manager_Ex<const ACE_TCHAR *,
                                 const ACE_TCHAR *,
@@ -114,9 +114,9 @@ static String_Table string_table[] =
 static int
 run_test (void)
 {
-  alloc.dump ();
+  ace_test_allocator.dump ();
 
-  HASH_STRING_MAP hash (MAX_HASH, &alloc);
+  HASH_STRING_MAP hash (MAX_HASH, &ace_test_allocator);
 
   size_t i;
 
@@ -244,7 +244,7 @@ run_test (void)
                          ACE_TEXT ("bind"),
                          string_table[i].key_), -1);
 
-  alloc.dump ();
+  ace_test_allocator.dump ();
   return 0;
 }
 
diff --git a/tests/Map_Test.cpp b/tests/Map_Test.cpp
index a946fbe6425..04e4a2e1f30 100644
--- a/tests/Map_Test.cpp
+++ b/tests/Map_Test.cpp
@@ -371,8 +371,8 @@ main (int argc, ACE_TCHAR *argv[])
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
 // Common typedefs.
-typedef ACE_Pair<KEY, VALUE> expanded_value;
-typedef ACE_Reference_Pair<const KEY, VALUE> value_type;
+typedef ACE_Pair<KEY, VALUE> ace_expanded_value;
+typedef ACE_Reference_Pair<const KEY, VALUE> ace_value_type;
 typedef ACE_Equal_To<KEY> COMPARE_KEYS;
 
 // Key related.
@@ -384,29 +384,29 @@ template class ACE_Reference_Pair<const KEY, VALUE>;
 
 // Map and iterator classes.
 template class ACE_Map<KEY, VALUE>;
-template class ACE_Iterator<value_type>;
-template class ACE_Reverse_Iterator<value_type>;
+template class ACE_Iterator<ace_value_type>;
+template class ACE_Reverse_Iterator<ace_value_type>;
 
 // Iterator base classes.
-template class ACE_Iterator_Impl<value_type>;
-template class ACE_Reverse_Iterator_Impl<value_type>;
+template class ACE_Iterator_Impl<ace_value_type>;
+template class ACE_Reverse_Iterator_Impl<ace_value_type>;
 
 // Active Map Manager related.
 template class ACE_Pair<KEY, VALUE>;
 template class ACE_Active_Map_Manager_Adapter<KEY, VALUE, Key_Adapter>;
-template class ACE_Active_Map_Manager_Iterator_Adapter<value_type, expanded_value>;
-template class ACE_Active_Map_Manager_Reverse_Iterator_Adapter<value_type, expanded_value>;
-template class ACE_Active_Map_Manager<expanded_value>;
-template class ACE_Map_Manager<ACE_Active_Map_Manager_Key, expanded_value, ACE_Null_Mutex>;
-template class ACE_Map_Iterator_Base<ACE_Active_Map_Manager_Key, expanded_value, ACE_Null_Mutex>;
-template class ACE_Map_Iterator<ACE_Active_Map_Manager_Key, expanded_value, ACE_Null_Mutex>;
-template class ACE_Map_Reverse_Iterator<ACE_Active_Map_Manager_Key, expanded_value, ACE_Null_Mutex>;
-template class ACE_Map_Entry<ACE_Active_Map_Manager_Key, expanded_value>;
+template class ACE_Active_Map_Manager_Iterator_Adapter<ace_value_type, ace_expanded_value>;
+template class ACE_Active_Map_Manager_Reverse_Iterator_Adapter<ace_value_type, ace_expanded_value>;
+template class ACE_Active_Map_Manager<ace_expanded_value>;
+template class ACE_Map_Manager<ACE_Active_Map_Manager_Key, ace_expanded_value, ACE_Null_Mutex>;
+template class ACE_Map_Iterator_Base<ACE_Active_Map_Manager_Key, ace_expanded_value, ACE_Null_Mutex>;
+template class ACE_Map_Iterator<ACE_Active_Map_Manager_Key, ace_expanded_value, ACE_Null_Mutex>;
+template class ACE_Map_Reverse_Iterator<ACE_Active_Map_Manager_Key, ace_expanded_value, ACE_Null_Mutex>;
+template class ACE_Map_Entry<ACE_Active_Map_Manager_Key, ace_expanded_value>;
 
 // Hash Map Manager related.
 template class ACE_Hash_Map_Manager_Ex_Adapter<KEY, VALUE, Hash_Key, COMPARE_KEYS, Key_Generator>;
-template class ACE_Hash_Map_Manager_Ex_Iterator_Adapter<value_type, KEY, VALUE, Hash_Key, COMPARE_KEYS>;
-template class ACE_Hash_Map_Manager_Ex_Reverse_Iterator_Adapter<value_type, KEY, VALUE, Hash_Key, COMPARE_KEYS>;
+template class ACE_Hash_Map_Manager_Ex_Iterator_Adapter<ace_value_type, KEY, VALUE, Hash_Key, COMPARE_KEYS>;
+template class ACE_Hash_Map_Manager_Ex_Reverse_Iterator_Adapter<ace_value_type, KEY, VALUE, Hash_Key, COMPARE_KEYS>;
 template class ACE_Hash_Map_Manager_Ex<KEY, VALUE, Hash_Key, COMPARE_KEYS, ACE_Null_Mutex>;
 template class ACE_Hash_Map_Iterator_Base_Ex<KEY, VALUE, Hash_Key, COMPARE_KEYS, ACE_Null_Mutex>;
 template class ACE_Hash_Map_Iterator_Ex<KEY, VALUE, Hash_Key, COMPARE_KEYS, ACE_Null_Mutex>;
@@ -415,8 +415,8 @@ template class ACE_Hash_Map_Entry<KEY, VALUE>;
 template class ACE_Equal_To<KEY>;
 
 // Map Manager related.
-template class ACE_Map_Manager_Iterator_Adapter<value_type, KEY, VALUE>;
-template class ACE_Map_Manager_Reverse_Iterator_Adapter<value_type, KEY, VALUE>;
+template class ACE_Map_Manager_Iterator_Adapter<ace_value_type, KEY, VALUE>;
+template class ACE_Map_Manager_Reverse_Iterator_Adapter<ace_value_type, KEY, VALUE>;
 template class ACE_Map_Manager_Adapter<KEY, VALUE, Key_Generator>;
 template class ACE_Map_Manager<KEY, VALUE, ACE_Null_Mutex>;
 template class ACE_Map_Iterator_Base<KEY, VALUE, ACE_Null_Mutex>;
@@ -427,8 +427,8 @@ template class ACE_Map_Entry<KEY, VALUE>;
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
 
 // Common typedefs.
-typedef ACE_Pair<KEY, VALUE> expanded_value;
-typedef ACE_Reference_Pair<const KEY, VALUE> value_type;
+typedef ACE_Pair<KEY, VALUE> ace_expanded_value;
+typedef ACE_Reference_Pair<const KEY, VALUE> ace_value_type;
 typedef ACE_Equal_To<KEY> COMPARE_KEYS;
 
 // Key related.
@@ -440,29 +440,29 @@ typedef ACE_Equal_To<KEY> COMPARE_KEYS;
 
 // Map and iterator classes.
 #pragma instantiate ACE_Map<KEY, VALUE>
-#pragma instantiate ACE_Iterator<value_type>
-#pragma instantiate ACE_Reverse_Iterator<value_type>
+#pragma instantiate ACE_Iterator<ace_value_type>
+#pragma instantiate ACE_Reverse_Iterator<ace_value_type>
 
 // Iterator base classes.
-#pragma instantiate ACE_Iterator_Impl<value_type>
-#pragma instantiate ACE_Reverse_Iterator_Impl<value_type>
+#pragma instantiate ACE_Iterator_Impl<ace_value_type>
+#pragma instantiate ACE_Reverse_Iterator_Impl<ace_value_type>
 
 // Active Map Manager related.
 #pragma instantiate ACE_Pair<KEY, VALUE>
 #pragma instantiate ACE_Active_Map_Manager_Adapter<KEY, VALUE, Key_Adapter>
-#pragma instantiate ACE_Active_Map_Manager_Iterator_Adapter<value_type, expanded_value>
-#pragma instantiate ACE_Active_Map_Manager_Reverse_Iterator_Adapter<value_type, expanded_value>
-#pragma instantiate ACE_Active_Map_Manager<expanded_value>
-#pragma instantiate ACE_Map_Manager<ACE_Active_Map_Manager_Key, expanded_value, ACE_Null_Mutex>
-#pragma instantiate ACE_Map_Iterator_Base<ACE_Active_Map_Manager_Key, expanded_value, ACE_Null_Mutex>
-#pragma instantiate ACE_Map_Iterator<ACE_Active_Map_Manager_Key, expanded_value, ACE_Null_Mutex>
-#pragma instantiate ACE_Map_Reverse_Iterator<ACE_Active_Map_Manager_Key, expanded_value, ACE_Null_Mutex>
-#pragma instantiate ACE_Map_Entry<ACE_Active_Map_Manager_Key, expanded_value>
+#pragma instantiate ACE_Active_Map_Manager_Iterator_Adapter<ace_value_type, ace_expanded_value>
+#pragma instantiate ACE_Active_Map_Manager_Reverse_Iterator_Adapter<ace_value_type, ace_expanded_value>
+#pragma instantiate ACE_Active_Map_Manager<ace_expanded_value>
+#pragma instantiate ACE_Map_Manager<ACE_Active_Map_Manager_Key, ace_expanded_value, ACE_Null_Mutex>
+#pragma instantiate ACE_Map_Iterator_Base<ACE_Active_Map_Manager_Key, ace_expanded_value, ACE_Null_Mutex>
+#pragma instantiate ACE_Map_Iterator<ACE_Active_Map_Manager_Key, ace_expanded_value, ACE_Null_Mutex>
+#pragma instantiate ACE_Map_Reverse_Iterator<ACE_Active_Map_Manager_Key, ace_expanded_value, ACE_Null_Mutex>
+#pragma instantiate ACE_Map_Entry<ACE_Active_Map_Manager_Key, ace_expanded_value>
 
 // Hash Map Manager related.
 #pragma instantiate ACE_Hash_Map_Manager_Ex_Adapter<KEY, VALUE, Hash_Key, COMPARE_KEYS, Key_Generator>
-#pragma instantiate ACE_Hash_Map_Manager_Ex_Iterator_Adapter<value_type, KEY, VALUE, Hash_Key, COMPARE_KEYS>
-#pragma instantiate ACE_Hash_Map_Manager_Ex_Reverse_Iterator_Adapter<value_type, KEY, VALUE, Hash_Key, COMPARE_KEYS>
+#pragma instantiate ACE_Hash_Map_Manager_Ex_Iterator_Adapter<ace_value_type, KEY, VALUE, Hash_Key, COMPARE_KEYS>
+#pragma instantiate ACE_Hash_Map_Manager_Ex_Reverse_Iterator_Adapter<ace_value_type, KEY, VALUE, Hash_Key, COMPARE_KEYS>
 #pragma instantiate ACE_Hash_Map_Manager_Ex<KEY, VALUE, Hash_Key, COMPARE_KEYS, ACE_Null_Mutex>
 #pragma instantiate ACE_Hash_Map_Iterator_Base_Ex<KEY, VALUE, Hash_Key, COMPARE_KEYS, ACE_Null_Mutex>
 #pragma instantiate ACE_Hash_Map_Iterator_Ex<KEY, VALUE, Hash_Key, COMPARE_KEYS, ACE_Null_Mutex>
@@ -471,8 +471,8 @@ typedef ACE_Equal_To<KEY> COMPARE_KEYS;
 #pragma instantiate ACE_Equal_To<KEY>
 
 // Map Manager related.
-#pragma instantiate ACE_Map_Manager_Iterator_Adapter<value_type, KEY, VALUE>
-#pragma instantiate ACE_Map_Manager_Reverse_Iterator_Adapter<value_type, KEY, VALUE>
+#pragma instantiate ACE_Map_Manager_Iterator_Adapter<ace_value_type, KEY, VALUE>
+#pragma instantiate ACE_Map_Manager_Reverse_Iterator_Adapter<ace_value_type, KEY, VALUE>
 #pragma instantiate ACE_Map_Manager_Adapter<KEY, VALUE, Key_Generator>
 #pragma instantiate ACE_Map_Manager<KEY, VALUE, ACE_Null_Mutex>
 #pragma instantiate ACE_Map_Iterator_Base<KEY, VALUE, ACE_Null_Mutex>