summaryrefslogtreecommitdiff
path: root/ace/Service_Config.cpp
diff options
context:
space:
mode:
authorschmidt <douglascraigschmidt@users.noreply.github.com>1996-10-26 22:38:49 +0000
committerschmidt <douglascraigschmidt@users.noreply.github.com>1996-10-26 22:38:49 +0000
commitd86f427ede3d90e8f579a52061449d39a611bd55 (patch)
tree04db92726a3f75f550b325bd4924ec24b6bdebd6 /ace/Service_Config.cpp
parent6ca4654f27f63096ee7f1f0c3b3b95b76d1ce5a1 (diff)
downloadATCD-d86f427ede3d90e8f579a52061449d39a611bd55.tar.gz
I'm done
Diffstat (limited to 'ace/Service_Config.cpp')
-rw-r--r--ace/Service_Config.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/ace/Service_Config.cpp b/ace/Service_Config.cpp
index 36d1ec40672..96a1ad3e89b 100644
--- a/ace/Service_Config.cpp
+++ b/ace/Service_Config.cpp
@@ -555,7 +555,7 @@ ACE_Service_Config::open (const char program_name[])
// Only use STDERR if the users hasn't yet set the flags.
if (ACE_LOG_MSG->open (program_name,
- ACE_LOG_MSG->flags() ? ACE_LOG_MSG->flags() : ACE_Log_Msg::STDERR,
+ ACE_LOG_MSG->flags() ? ACE_LOG_MSG->flags() : (u_long) ACE_Log_Msg::STDERR,
ACE_Service_Config::logger_key_) == -1)
return -1;
ACE_DEBUG ((LM_STARTUP, "starting up daemon %n\n"));
@@ -916,8 +916,8 @@ ACE_Service_Config::reconfig_occurred (sig_atomic_t config_occurred)
template class ACE_Set_Node<ACE_Static_Svc_Descriptor *>;
template class ACE_Unbounded_Set<ACE_Static_Svc_Descriptor *>;
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 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>;