summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbala <balanatarajan@users.noreply.github.com>2003-06-12 20:36:29 +0000
committerbala <balanatarajan@users.noreply.github.com>2003-06-12 20:36:29 +0000
commita8f0d103775d66bda40f881a983b819dbe73a9f1 (patch)
treef2b0553f055c5d78ee399a8e0ce9409bfdd0c3a9
parent9952caf331b095f5ec9bcf3c92ca51e35e09ad1f (diff)
downloadATCD-a8f0d103775d66bda40f881a983b819dbe73a9f1.tar.gz
ChangeLogTag:Thu Jun 12 15:34:15 2003 Balachandran Natarajan <bala@dre.vanderbilt.edu>
-rw-r--r--TAO/ChangeLog7
-rw-r--r--TAO/tao/Typecode.cpp10
2 files changed, 8 insertions, 9 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index ac53e147c3f..c7c8cc293fd 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,10 @@
+Thu Jun 12 15:34:15 2003 Balachandran Natarajan <bala@dre.vanderbilt.edu>
+
+ * tao/Typecode.cpp: In lieu of the following "Thu Jun 12 15:20:37
+ 2003 Balachandran Natarajan <bala@dre.vanderbilt.edu>" change
+ in ACE, the explicit template instantiations for
+ ACE_Unbounded_Queue<> is now removed.
+
Thu Jun 12 14:53:56 2003 Balachandran Natarajan <bala@dre.vanderbilt.edu>
* tao/BiDir_GIOP/BiDir_Policy_i.cpp: Fixed compilation errors on
diff --git a/TAO/tao/Typecode.cpp b/TAO/tao/Typecode.cpp
index 5f0b933dbdf..0e6f7fee172 100644
--- a/TAO/tao/Typecode.cpp
+++ b/TAO/tao/Typecode.cpp
@@ -3712,10 +3712,6 @@ operator>> (TAO_InputCDR& cdr, CORBA::TypeCode *&x)
template class TAO_Pseudo_Object_Manager<CORBA::TypeCode,
CORBA::TypeCode_var>;
-template class ACE_Node<CORBA::Long>;
-template class ACE_Unbounded_Queue<CORBA::Long>;
-template class ACE_Unbounded_Queue_Iterator<CORBA::Long>;
-
template class ACE_Hash_Map_Entry<const char *,
ACE_Unbounded_Queue<CORBA::Long> *>;
template class ACE_Hash_Map_Manager_Ex<const char *,
@@ -3746,13 +3742,9 @@ template class TAO_Pseudo_Out_T<CORBA::TypeCode, CORBA::TypeCode_var>;
#pragma instantiate TAO_Pseudo_Object_Manager<CORBA::TypeCode, CORBA::TypeCode_var>
-#pragma instantiate ACE_Node<CORBA::Long>
-#pragma instantiate ACE_Unbounded_Queue<CORBA::Long>
-#pragma instantiate ACE_Unbounded_Queue_Iterator<CORBA::Long>
-
#pragma instantiate ACE_Hash_Map_Entry<const char *, ACE_Unbounded_Queue<CORBA::Long> *>
#pragma instantiate ACE_Hash_Map_Manager_Ex<const char *, ACE_Unbounded_Queue<CORBA::Long> *, ACE_Hash<const char *>, ACE_Equal_To<const char *>, ACE_Null_Mutex>
-#pragma instantiate ACE_Hash_Map_Iterator_Base_Ex<const char *, ACE_Unbounded_Queue<CORBA::Long> *, ACE_Hash<const char *>, ACE_Equal_To<const char *>, ACE_Null_Mutex>
+#pragma instantiate ACE_Hash_Map_Iterator_Base_Ex<const char *, ACE_Unbounded_Queue<CORBA::Long> *, ACE_Hash<const char *>, ACE_Equal_To<const char *>, ACE_Nullv_Mutex>
#pragma instantiate ACE_Hash_Map_Reverse_Iterator_Ex<const char *, ACE_Unbounded_Queue<CORBA::Long> *, ACE_Hash<const char *>, ACE_Equal_To<const char *>, ACE_Null_Mutex>
#pragma instantiate ACE_Hash_Map_Iterator_Ex<const char *, ACE_Unbounded_Queue<CORBA::Long> *, ACE_Hash<const char *>, ACE_Equal_To<const char *>, ACE_Null_Mutex>