ChangeLogTag:Sun Jan 16 16:13:00 2000 Ossama Othman <ossama@uci.edu>

3 files changed, 29 insertions, 7 deletions

diff --git a/ace/ACE.cpp b/ace/ACE.cpp
index 64dbaedcf45..c1a3f299f89 100644
--- a/ace/ACE.cpp
+++ b/ace/ACE.cpp
@@ -4157,6 +4157,22 @@ ACE::strend (const char *s)
   return s;
 }
 
+
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+
+template class ACE_Malloc<ACE_LOCAL_MEMORY_POOL, ACE_SYNCH_MUTEX>;
+template class ACE_Malloc_T<ACE_LOCAL_MEMORY_POOL, ACE_SYNCH_MUTEX, ACE_Control_Block>;
+template class ACE_Allocator_Adapter<ACE_Malloc<ACE_LOCAL_MEMORY_POOL, ACE_SYNCH_MUTEX> >;
+
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+
+#pragma instantiate ACE_Malloc<ACE_LOCAL_MEMORY_POOL, ACE_SYNCH_MUTEX>
+#pragma instantiate ACE_Malloc_T<ACE_LOCAL_MEMORY_POOL, ACE_SYNCH_MUTEX, ACE_Control_Block>
+#pragma instantiate ACE_Allocator_Adapter<ACE_Malloc<ACE_LOCAL_MEMORY_POOL,ACE_SYNCH_MUTEX> >
+
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+
+
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) && (defined (__unix) || defined (__Lynx__) || defined (_AIX))
 template class ACE_Auto_Array_Ptr<struct ifreq>;
 template class ACE_Auto_Basic_Array_Ptr<struct ifreq>;
diff --git a/ace/Configuration.cpp b/ace/Configuration.cpp
index fb686f35a56..084577067b0 100644
--- a/ace/Configuration.cpp
+++ b/ace/Configuration.cpp
@@ -1761,11 +1761,8 @@ ACE_Configuration_Heap::remove_value (const ACE_Configuration_Section_Key& key,
 // ACE_SYNCH_MUTEX should not be used in the template instantiations
 // because the resulting template instantiation for the
 // single-threaded case already exists in ACE.
-template class ACE_Allocator_Adapter<ACE_Malloc<ACE_LOCAL_MEMORY_POOL, ACE_Thread_Mutex> >;
 template class ACE_Allocator_Adapter<ACE_Malloc<ACE_MMAP_MEMORY_POOL, ACE_Thread_Mutex> >;
-template class ACE_Malloc<ACE_LOCAL_MEMORY_POOL, ACE_Thread_Mutex>;
 template class ACE_Malloc<ACE_MMAP_MEMORY_POOL, ACE_Thread_Mutex>;
-template class ACE_Malloc_T<ACE_LOCAL_MEMORY_POOL, ACE_Thread_Mutex, ACE_Control_Block>;
 template class ACE_Malloc_T<ACE_MMAP_MEMORY_POOL, ACE_Thread_Mutex, ACE_Control_Block>;
 #endif /* ACE_HAS_THREADS */
 template class ACE_Hash_Map_Entry<ACE_Configuration_ExtId, ACE_Configuration_Section_IntId>;
@@ -1776,7 +1773,7 @@ template class ACE_Hash_Map_Iterator_Base_Ex<ACE_Configuration_ExtId, ACE_Config
 template class ACE_Hash_Map_Iterator_Base_Ex<ACE_Configuration_ExtId, int, ACE_Hash<ACE_Configuration_ExtId>, ACE_Equal_To<ACE_Configuration_ExtId>, ACE_Null_Mutex>;
 
 
-// Added to fix problems in SunOs CC5.0
+// Added to fix problems in SunOS CC5.0
 template class ACE_Hash_Map_Reverse_Iterator_Ex<ACE_Configuration_ExtId,ACE_Configuration_Value_IntId,ACE_Hash<ACE_Configuration_ExtId>,ACE_Equal_To<ACE_Configuration_ExtId>,ACE_Null_Mutex>;
 template class ACE_Hash_Map_Iterator_Ex<ACE_Configuration_ExtId,ACE_Configuration_Value_IntId,ACE_Hash<ACE_Configuration_ExtId>,ACE_Equal_To<ACE_Configuration_ExtId>,ACE_Null_Mutex>;
 template class ACE_Hash_Map_Iterator_Ex<ACE_Configuration_ExtId,int,ACE_Hash<ACE_Configuration_ExtId>,ACE_Equal_To<ACE_Configuration_ExtId>,ACE_Null_Mutex>;
@@ -1802,11 +1799,8 @@ template class ACE_Hash_Map_With_Allocator<ACE_Configuration_ExtId, int>;
 // ACE_SYNCH_MUTEX should not be used in the template instantiations
 // because the resulting template instantiation for the
 // single-threaded case already exists in ACE.
-#pragma instantiate ACE_Allocator_Adapter<ACE_Malloc<ACE_LOCAL_MEMORY_POOL, ACE_Thread_Mutex> >
 #pragma instantiate ACE_Allocator_Adapter<ACE_Malloc<ACE_MMAP_MEMORY_POOL, ACE_Thread_Mutex> >
-#pragma instantiate ACE_Malloc<ACE_LOCAL_MEMORY_POOL, ACE_Thread_Mutex>
 #pragma instantiate ACE_Malloc<ACE_MMAP_MEMORY_POOL, ACE_Thread_Mutex>
-#pragma instantiate ACE_Malloc_T<ACE_LOCAL_MEMORY_POOL, ACE_Thread_Mutex, ACE_Control_Block>
 #pragma instantiate ACE_Malloc_T<ACE_MMAP_MEMORY_POOL, ACE_Thread_Mutex, ACE_Control_Block>
 #endif /* ACE_HAS_THREADS */
 #pragma instantiate ACE_Hash_Map_Entry<ACE_Configuration_ExtId, ACE_Configuration_Section_IntId>
diff --git a/ace/config.h.in b/ace/config.h.in
index 6a3a83e3a07..6f989c77cf1 100644
--- a/ace/config.h.in
+++ b/ace/config.h.in
@@ -1005,6 +1005,12 @@
 /* Platform lacks getppid() call. */
 #undef ACE_LACKS_GETPPID
 
+/* Platform lacks setregid() call. */
+#undef ACE_LACKS_SETREGID
+
+/* Platform lacks setreuid() call. */
+#undef ACE_LACKS_SETREUID
+
 /* Platforms lacks getservbyname() (e.g., VxWorks and Chorus). */
 #undef ACE_LACKS_GETSERVBYNAME
 
@@ -1228,6 +1234,12 @@
 /* Platform/compiler lacks the getpgid() prototype */
 #undef ACE_LACKS_GETPGID_PROTOTYPE
 
+/* Platform/compiler lacks the setregid() prototype */
+#undef ACE_LACKS_SETREGID_PROTO
+
+/* Platform/compiler lacks the setreuid() prototype */
+#undef ACE_LACKS_SETREUID_PROTO
+
 /* Platform/compiler lacks the strptime() prototype */
 #undef ACE_LACKS_STRPTIME_PROTOTYPE