diff options
| author | brunsch <brunsch@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2000-04-23 04:43:59 +0000 |
|---|---|---|
| committer | brunsch <brunsch@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2000-04-23 04:43:59 +0000 |
| commit | a7c03cabf931b077d70c6f80ec02c7728a429f49 (patch) | |
| tree | 61d38d262d43ac77fc2ad94c9e7e850cd5607622 /ace/Object_Manager.cpp | |
| parent | 2aa7b10780ad7c670f588dce4ec341351a0646aa (diff) | |
| download | ATCD-a7c03cabf931b077d70c6f80ec02c7728a429f49.tar.gz | |
ChangeLogTag:Sat Apr 22 20:53:11 2000 Darrell Brunsch <brunsch@uci.edu>
Diffstat (limited to 'ace/Object_Manager.cpp')
| -rw-r--r-- | ace/Object_Manager.cpp | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/ace/Object_Manager.cpp b/ace/Object_Manager.cpp index 9066143fdca..e18a7c307ee 100644 --- a/ace/Object_Manager.cpp +++ b/ace/Object_Manager.cpp @@ -120,9 +120,10 @@ ACE_Object_Manager_Preallocations::ACE_Object_Manager_Preallocations (void) { // Define the static services. This macro call creates static // service descriptors that are used for initialization below. -#if !defined (ACE_HAS_WINCE) && !defined (ACE_LACKS_ACE_OTHER) +#if !defined (ACE_HAS_WINCE) && !defined (ACE_LACKS_ACE_OTHER) && \ + defined (ACE_HAS_WCHAR) ACE_STATIC_SVC_DEFINE (ACE_Naming_Context_initializer, - ASYS_TEXT ("ACE_Naming_Context"), + ACE_TEXT ("ACE_Naming_Context"), ACE_SVC_OBJ_T, &ACE_SVC_NAME (ACE_Naming_Context), ACE_Service_Type::DELETE_THIS | @@ -132,7 +133,7 @@ ACE_Object_Manager_Preallocations::ACE_Object_Manager_Preallocations (void) #endif /* ! ACE_HAS_WINCE && ! ACE_LACKS_ACE_OTHER */ ACE_STATIC_SVC_DEFINE (ACE_Service_Manager_initializer, - ASYS_TEXT ("ACE_Service_Manager"), + ACE_TEXT ("ACE_Service_Manager"), ACE_SVC_OBJ_T, &ACE_SVC_NAME (ACE_Service_Manager), ACE_Service_Type::DELETE_THIS | @@ -141,7 +142,8 @@ ACE_Object_Manager_Preallocations::ACE_Object_Manager_Preallocations (void) // Initialize the static service objects using the descriptors created // above. -#if !defined (ACE_HAS_WINCE) && !defined (ACE_LACKS_ACE_OTHER) +#if !defined (ACE_HAS_WINCE) && !defined (ACE_LACKS_ACE_OTHER) && \ + defined (ACE_HAS_WCHAR) ace_svc_desc_ACE_Naming_Context = ace_svc_desc_ACE_Naming_Context_initializer; #endif /* ! ACE_HAS_WINCE && ! ACE_LACKS_ACE_OTHER */ |