diff options
| author | cdgill <cdgill@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1998-12-06 22:48:32 +0000 |
|---|---|---|
| committer | cdgill <cdgill@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1998-12-06 22:48:32 +0000 |
| commit | 2e7f7a702b06972f2657dfbee3d803acdaf5ade7 (patch) | |
| tree | b628409c5442a2dff01eb8249264fada59d8a1dd /ace/Parse_Node.cpp | |
| parent | 69ea340a79fd5e25005da4766eb8c3a89843f41d (diff) | |
| download | ATCD-2e7f7a702b06972f2657dfbee3d803acdaf5ade7.tar.gz | |
Changes for pSOS using Diab 4.2a release
Diffstat (limited to 'ace/Parse_Node.cpp')
| -rw-r--r-- | ace/Parse_Node.cpp | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/ace/Parse_Node.cpp b/ace/Parse_Node.cpp index 8a8c1d25578..fc314b0ab42 100644 --- a/ace/Parse_Node.cpp +++ b/ace/Parse_Node.cpp @@ -77,7 +77,14 @@ ACE_Parse_Node::link (ACE_Parse_Node *n) ACE_Stream_Node::ACE_Stream_Node (const ACE_Static_Node *str_ops, const ACE_Parse_Node *str_mods) +#if defined (ACE_HAS_BROKEN_CONDITIONAL_STRING_CASTS) + : ACE_Parse_Node (str_ops == 0 ? ACE_static_cast (char *, + ASYS_TEXT ("<unknown>")) + : ACE_static_cast (char *, + str_ops->name ())), +#else : ACE_Parse_Node (str_ops == 0 ? "<unknown>" : str_ops->name ()), +#endif /* defined (ACE_HAS_BROKEN_CONDITIONAL_STRING_CASTS) */ node_ (str_ops), mods_ (str_mods) { @@ -180,7 +187,7 @@ ACE_Resume_Node::apply (void) if (ACE_Service_Config::resume (this->name ()) == -1) ace_yyerrno++; - if (ACE::debug ()) + if (ACE::debug ()) ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("did resume on %s, error = %d\n"), this->name (), @@ -392,7 +399,7 @@ ACE_Location_Node::open_handle (void) ASYS_TCHAR dl_exppathname[MAXPATHLEN]; if (::ExpandEnvironmentStringsA (name, dl_exppathname, - MAXPATHLEN)) + MAXPATHLEN)) name = dl_exppathname; #endif /* ACE_WIN32 */ |