summaryrefslogtreecommitdiff
path: root/ace
diff options
context:
space:
mode:
authorschmidt <douglascraigschmidt@users.noreply.github.com>1996-10-27 23:14:37 +0000
committerschmidt <douglascraigschmidt@users.noreply.github.com>1996-10-27 23:14:37 +0000
commit742c04c6fe01984a9699acfc664b0c88d9f5d5dc (patch)
treef94e403b95ed7578914bb1fd612e103e408b497a /ace
parent0cc5504a5c8a958101a09accb21c135281d5e9ff (diff)
downloadATCD-742c04c6fe01984a9699acfc664b0c88d9f5d5dc.tar.gz
Yow!
Diffstat (limited to 'ace')
-rw-r--r--ace/Dump.cpp2
-rw-r--r--ace/Local_Name_Space.cpp9
-rw-r--r--ace/Log_Msg.cpp3
-rw-r--r--ace/OS.i1
-rw-r--r--ace/Reactor.cpp2
-rw-r--r--ace/SPIPE_Acceptor.cpp2
-rw-r--r--ace/SPIPE_Connector.cpp6
-rw-r--r--ace/Service_Config.cpp2
-rw-r--r--ace/Signal.cpp2
-rw-r--r--ace/Synch.cpp4
-rw-r--r--ace/Token_Collection.cpp4
11 files changed, 19 insertions, 18 deletions
diff --git a/ace/Dump.cpp b/ace/Dump.cpp
index d8d20781edc..4e0e0a67f37 100644
--- a/ace/Dump.cpp
+++ b/ace/Dump.cpp
@@ -131,5 +131,5 @@ ACE_ODB::remove_object (const void *this_ptr)
ACE_ODB *ACE_ODB::instance_ = 0;
#if defined (ACE_TEMPLATES_REQUIRE_SPECIALIZATION)
-template class ACE_Guard<ACE_Thread_Mutex>;
+ACE_MT (template class ACE_Guard<ACE_Thread_Mutex>);
#endif /* ACE_TEMPLATES_REQUIRE_SPECIALIZATION */
diff --git a/ace/Local_Name_Space.cpp b/ace/Local_Name_Space.cpp
index 0af46ec9f44..ec5b8365919 100644
--- a/ace/Local_Name_Space.cpp
+++ b/ace/Local_Name_Space.cpp
@@ -143,14 +143,11 @@ template class ACE_Unbounded_Set<ACE_WString>;
template class ACE_Unbounded_Set_Iterator<ACE_WString>;
template class ACE_Set_Node<ACE_WString>;
template class ACE_Set_Node<ACE_Name_Binding>;
-template class ACE_Guard<ACE_RW_Process_Mutex>;
-template class ACE_Guard<ACE_Null_Mutex>;
-template class ACE_Read_Guard<ACE_RW_Process_Mutex>;
-template class ACE_Read_Guard<ACE_Null_Mutex>;
-template class ACE_Write_Guard<ACE_RW_Process_Mutex>;
-template class ACE_Write_Guard<ACE_Null_Mutex>;
template class ACE_Map_Manager<ACE_NS_String, ACE_NS_Internal, ACE_Null_Mutex>;
template class ACE_Map_Iterator<ACE_NS_String, ACE_NS_Internal, ACE_Null_Mutex>;
template class ACE_Map_Entry <ACE_NS_String, ACE_NS_Internal>;
+template class ACE_Guard<ACE_RW_Process_Mutex>;
+template class ACE_Read_Guard<ACE_RW_Process_Mutex>;
+template class ACE_Write_Guard<ACE_RW_Process_Mutex>;
#endif /* ACE_TEMPLATES_REQUIRE_SPECIALIZATION */
#endif /* ACE_LOCAL_NAME_SPACE_C */
diff --git a/ace/Log_Msg.cpp b/ace/Log_Msg.cpp
index 86f2ee3b734..7c713ca9040 100644
--- a/ace/Log_Msg.cpp
+++ b/ace/Log_Msg.cpp
@@ -349,6 +349,7 @@ ACE_Log_Msg::log (const char *format_str,
{
ACE_TRACE ("ACE_Log_Msg::log");
// External decls.
+
extern int sys_nerr;
typedef void (*PTF)(...);
@@ -891,5 +892,5 @@ ACE_Log_Msg::getpid (void) const
}
#if defined (ACE_TEMPLATES_REQUIRE_SPECIALIZATION)
-template class ACE_Guard<ACE_Recursive_Thread_Mutex>;
+ACE_MT (template class ACE_Guard<ACE_Recursive_Thread_Mutex>);
#endif /* ACE_TEMPLATES_REQUIRE_SPECIALIZATION */
diff --git a/ace/OS.i b/ace/OS.i
index aba7fbc3fdd..cac37598a20 100644
--- a/ace/OS.i
+++ b/ace/OS.i
@@ -281,6 +281,7 @@ ACE_OS::rand_r (ACE_RANDR_TYPE seed)
#if defined (ACE_HAS_REENTRANT_FUNCTIONS) && defined (ACE_MT_SAFE)
ACE_OSCALL_RETURN (::rand_r (seed), int, -1);
#else
+ seed = seed;
ACE_OSCALL_RETURN (::rand (), int, -1);
#endif
}
diff --git a/ace/Reactor.cpp b/ace/Reactor.cpp
index 580bfe0b4ca..4e58ae76fd0 100644
--- a/ace/Reactor.cpp
+++ b/ace/Reactor.cpp
@@ -1614,6 +1614,6 @@ ACE_Reactor::check_handles (void)
}
#if defined (ACE_TEMPLATES_REQUIRE_SPECIALIZATION)
-template class ACE_Guard<ACE_Token>;
+ACE_MT (template class ACE_Guard<ACE_REACTOR_MUTEX>);
#endif /* ACE_TEMPLATES_REQUIRE_SPECIALIZATION */
diff --git a/ace/SPIPE_Acceptor.cpp b/ace/SPIPE_Acceptor.cpp
index c3d7458257d..6c2d64742b0 100644
--- a/ace/SPIPE_Acceptor.cpp
+++ b/ace/SPIPE_Acceptor.cpp
@@ -36,7 +36,7 @@ ACE_SPIPE_Acceptor::dump (void) const
int
ACE_SPIPE_Acceptor::open (const ACE_SPIPE_Addr &local_sap,
- int reuse_addr,
+ int /* reuse_addr */,
int perms)
{
ACE_TRACE ("ACE_SPIPE_Acceptor::open");
diff --git a/ace/SPIPE_Connector.cpp b/ace/SPIPE_Connector.cpp
index 5d8a7e34f5f..05fdf7665ea 100644
--- a/ace/SPIPE_Connector.cpp
+++ b/ace/SPIPE_Connector.cpp
@@ -11,7 +11,7 @@ ACE_ALLOC_HOOK_DEFINE(ACE_SPIPE_Connector)
ACE_SPIPE_Connector::ACE_SPIPE_Connector (ACE_SPIPE_Stream &new_io,
const ACE_SPIPE_Addr &remote_sap,
ACE_Time_Value *timeout,
- const ACE_Addr &local_sap,
+ const ACE_Addr & local_sap,
int reuse_addr,
int flags,
int perms)
@@ -39,8 +39,8 @@ int
ACE_SPIPE_Connector::connect (ACE_SPIPE_Stream &new_io,
const ACE_SPIPE_Addr &remote_sap,
ACE_Time_Value *timeout,
- const ACE_Addr &local_sap,
- int reuse_addr,
+ const ACE_Addr & /* local_sap */,
+ int /* reuse_addr */,
int flags,
int perms)
{
diff --git a/ace/Service_Config.cpp b/ace/Service_Config.cpp
index 96a1ad3e89b..c3da8a2b968 100644
--- a/ace/Service_Config.cpp
+++ b/ace/Service_Config.cpp
@@ -919,9 +919,7 @@ template class ACE_Unbounded_Set_Iterator<ACE_Static_Svc_Descriptor *>;
template class ACE_Malloc<ACE_LOCAL_MEMORY_POOL, ACE_Null_Mutex>;
template class ACE_Allocator_Adapter<ACE_Malloc<ACE_LOCAL_MEMORY_POOL, ACE_Null_Mutex> >;
template class auto_ptr<ACE_Obstack>;
-#if !defined (ACE_HAS_THREADS)
template class ACE_Guard<ACE_Null_Mutex>;
template class ACE_Read_Guard<ACE_Null_Mutex>;
template class ACE_Write_Guard<ACE_Null_Mutex>;
-#endif /* ACE_HAS_THREADS */
#endif /* ACE_TEMPLATES_REQUIRE_SPECIALIZATION */
diff --git a/ace/Signal.cpp b/ace/Signal.cpp
index fea398c7ee8..8232c639e72 100644
--- a/ace/Signal.cpp
+++ b/ace/Signal.cpp
@@ -626,7 +626,7 @@ ACE_Sig_Handlers::handler (int signum, ACE_Event_Handler *new_sh)
}
#if defined (ACE_TEMPLATES_REQUIRE_SPECIALIZATION)
-template class ACE_TSS_Guard<ACE_Recursive_Thread_Mutex>;
+ACE_MT (template class ACE_TSS_Guard<ACE_Recursive_Thread_Mutex>);
template class ACE_Fixed_Set<ACE_Event_Handler *, ACE_MAX_SIGNAL_HANDLERS>;
template class ACE_Fixed_Set_Iterator<ACE_Event_Handler *, ACE_MAX_SIGNAL_HANDLERS>;
#endif /* ACE_TEMPLATES_REQUIRE_SPECIALIZATION */
diff --git a/ace/Synch.cpp b/ace/Synch.cpp
index f8dfcb4f9bd..836f8a693c3 100644
--- a/ace/Synch.cpp
+++ b/ace/Synch.cpp
@@ -36,6 +36,8 @@ ACE_Process_Mutex::ACE_Process_Mutex (LPCTSTR name, void *arg)
: lock_ (name)
#endif /* ACE_WIN32 || ACE_HAS_POSIX_SEM */
{
+ name = name;
+ arg = arg;
// ACE_TRACE ("ACE_Process_Mutex::ACE_Process_Mutex");
}
@@ -319,6 +321,8 @@ ACE_Process_Semaphore::ACE_Process_Semaphore (u_int count,
: lock_ (name, ACE_SV_Semaphore_Complex::ACE_CREATE, count)
#endif /* ACE_WIN32 || ACE_HAS_POSIX_SEM */
{
+ arg = arg;
+ max = max;
// ACE_TRACE ("ACE_Process_Semaphore::ACE_Process_Semaphore");
}
diff --git a/ace/Token_Collection.cpp b/ace/Token_Collection.cpp
index c9f325ccb4c..0f98fbb0b75 100644
--- a/ace/Token_Collection.cpp
+++ b/ace/Token_Collection.cpp
@@ -204,7 +204,7 @@ ACE_Token_Collection::renew (const char *token_name,
}
int
-ACE_Token_Collection::release (ACE_Synch_Options &options)
+ACE_Token_Collection::release (ACE_Synch_Options &)
{
ACE_TRACE ("ACE_Token_Collection::release");
@@ -265,7 +265,7 @@ ACE_Token_Collection::clone (void) const
// This method doesn't mean anything for a collection.
ACE_Tokens *
-ACE_Token_Collection::create_token (const char *name)
+ACE_Token_Collection::create_token (const char *)
{
ACE_TRACE ("ACE_Token_Collection::create_token");
return (ACE_Tokens *) 0;