diff options
| author | krish <krish@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1999-11-20 00:43:21 +0000 |
|---|---|---|
| committer | krish <krish@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1999-11-20 00:43:21 +0000 |
| commit | 62bf47721320f7f81034b200fe9f2a0200341caa (patch) | |
| tree | 2b043bddcd7827419eae60015cfb00da8b72f581 | |
| parent | f3c4be7a605b666dca38906f880774fa02d4a38e (diff) | |
| download | ATCD-62bf47721320f7f81034b200fe9f2a0200341caa.tar.gz | |
ChangeLogTag: Fri Nov 19 18:41:25 1999 Krishnakumar Elakkara Pathayapura <krish@cs.wustl.edu>
| -rw-r--r-- | TAO/ChangeLog-99c | 12 | ||||
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/Log/LogRecordStore.cpp | 13 |
2 files changed, 19 insertions, 6 deletions
diff --git a/TAO/ChangeLog-99c b/TAO/ChangeLog-99c index dd660f49891..7f0da3e2b83 100644 --- a/TAO/ChangeLog-99c +++ b/TAO/ChangeLog-99c @@ -1,3 +1,9 @@ +Fri Nov 19 18:41:25 1999 Krishnakumar Elakkara Pathayapura <krish@cs.wustl.edu> + + * orbsvcs/orbsvcs/Log/LogRecordStore.cpp (log): + Fixed some problems for VxWorks regarding use + of ULongLong. + Fri Nov 19 18:26:06 1999 Jeff Parsons <parsons@cs.wustl.edu> * tao/Invocation.h: @@ -20,14 +26,14 @@ Fri Nov 19 18:26:06 1999 Jeff Parsons <parsons@cs.wustl.edu> octet 'response_flags'. The TAO_GIOP_Oneway_Request now has new members holding the SyncScope value and a reply dispatcher. It will set the 'response_flags' field - according to this SyncScope value. + according to this SyncScope value. Likewise, the server request will read the header field and store the SyncScope value. TAO_Object_Adapter has a new method which returns a reply after the servant has been located, but before it - is dispatched (for SyncScope value SYNC_WITH_SERVER). + is dispatched (for SyncScope value SYNC_WITH_SERVER). Finally, since SyncScope values must be - used (if only to set defaults) whether messaging is + used (if only to set defaults) whether messaging is enabled or not, a TAO:: duplicate set has been put into TAOC.*. diff --git a/TAO/orbsvcs/orbsvcs/Log/LogRecordStore.cpp b/TAO/orbsvcs/orbsvcs/Log/LogRecordStore.cpp index 0222bf11f1a..1d1b824065b 100644 --- a/TAO/orbsvcs/orbsvcs/Log/LogRecordStore.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/LogRecordStore.cpp @@ -82,10 +82,17 @@ LogRecordStore::log (DsLogAdmin::LogRecord &rec) // First, bind the id to the LogRecord in the hash_map if (this->rec_hash_.bind (rec.id, rec) != 0) { - ACE_ERROR_RETURN ((LM_ERROR, - "LogRecordStore (%P|%t):Failed to bind %d in the hash map\n", + #if defined (ACE_LACKS_LONGLONG_T) + ACE_ERROR_RETURN ((LM_ERROR, + "LogRecordStore (%P|%t):Failed to bind %Q in the hash map\n", + ACE_U64_TO_U32(rec.id)), + -1); + #else + ACE_ERROR_RETURN ((LM_ERROR, + "LogRecordStore (%P|%t):Failed to bind %Q in the hash map\n", rec.id), - -1); + -1); + #endif } // Increment the number of records in the log |