summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorelliott_c <ocielliottc@users.noreply.github.com>2004-11-03 13:16:23 +0000
committerelliott_c <ocielliottc@users.noreply.github.com>2004-11-03 13:16:23 +0000
commit625c41058014527aed49f108f547aca9fd86f386 (patch)
tree21393e26ccde279af6a786c18b14456b3695b83c
parent5c276256225dce03a30c0d2adc4e503babaa3043 (diff)
downloadATCD-625c41058014527aed49f108f547aca9fd86f386.tar.gz
ChangeLogTag: Wed Nov 3 07:15:24 2004 Chad Elliott <elliott_c@ociweb.com>
-rw-r--r--TAO/ChangeLog50
-rw-r--r--TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_ServerScheduler_i.i3
2 files changed, 30 insertions, 23 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index accc6b9a7e8..769da878a6d 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,9 +1,17 @@
+Wed Nov 3 07:15:24 2004 Chad Elliott <elliott_c@ociweb.com>
+
+ * orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_ServerScheduler_i.i:
+
+ The _hash method on CORBA::Object_var takes a CORBA::ULong which
+ is always 32 bits. Use a different macro instead of LONG_MAX
+ which can be 64 bits on some platforms.
+
Tue Nov 2 12:28:47 2004 J.T. Conklin <jtc@acorntoolworks.com>
- * orbsvcs/orbvcs/FT_CORBA.idl:
+ * orbsvcs/orbvcs/FT_CORBA.idl:
- Changed "orbsvcs/orbsvcs/" #include path prefix to "orbsvcs/".
- Was missed in earlier refactor.
+ Changed "orbsvcs/orbsvcs/" #include path prefix to "orbsvcs/".
+ Was missed in earlier refactor.
Tue Nov 2 12:23:20 2004 Jeff Parsons <j.parsons@vanderbilt.edu>
@@ -24,32 +32,32 @@ Tue Nov 2 12:23:20 2004 Jeff Parsons <j.parsons@vanderbilt.edu>
Tue Nov 2 09:43:18 2004 J.T. Conklin <jtc@acorntoolworks.com>
- * orbsvcs/FT_ReplicationManager/FT_ReplicationManager.mpc:
+ * orbsvcs/FT_ReplicationManager/FT_ReplicationManager.mpc:
- Changed FT_ReplicationManager project to inherit from core so
- that executable is installed.
+ Changed FT_ReplicationManager project to inherit from core so
+ that executable is installed.
- * orbsvcs/FT_ReplicationManager/Makefile.am:
- * orbsvcs/Fault_Detector/Makefile.am:
- * orbsvcs/Fault_Notifier/Makefile.am:
+ * orbsvcs/FT_ReplicationManager/Makefile.am:
+ * orbsvcs/Fault_Detector/Makefile.am:
+ * orbsvcs/Fault_Notifier/Makefile.am:
- Updated to install executables.
+ Updated to install executables.
- * orbsvcs/orbsvcs/Makefile.am:
+ * orbsvcs/orbsvcs/Makefile.am:
- Updated to omit Log/PersistantStore.cpp.
+ Updated to omit Log/PersistantStore.cpp.
Tue Nov 2 07:24:04 2004 J.T. Conklin <jtc@acorntoolworks.com>
- * orbsvcs/orbsvcs/Log/LogRecordStore.cpp:
- * orbsvcs/orbsvcs/Log/LogRecordStore.h:
+ * orbsvcs/orbsvcs/Log/LogRecordStore.cpp:
+ * orbsvcs/orbsvcs/Log/LogRecordStore.h:
- Added new method log_record_size() which returns the size of
- the log record including the contents of the Any field.
+ Added new method log_record_size() which returns the size of
+ the log record including the contents of the Any field.
- Changed log() and remove() methods to use log_record_size().
- The old implementation only counted the size of the LogRecord
- struct which seriously underestimates the size.
+ Changed log() and remove() methods to use log_record_size().
+ The old implementation only counted the size of the LogRecord
+ struct which seriously underestimates the size.
Mon Nov 1 15:18:12 UTC 2004 Johnny Willemsen <jwillemsen@remedy.nl>
@@ -64,9 +72,9 @@ Sun Oct 31 15:51:12 UTC 2004 Johnny Willemsen <jwillemsen@remedy.nl>
Sat Oct 30 15:28:09 2004 Balachandran Natarajan <bala@dre.vanderbilt.edu>
- * orbsvcs/tests/Trading/TT_Info.cpp:
+ * orbsvcs/tests/Trading/TT_Info.cpp:
- Fixed typos.
+ Fixed typos.
Fri Oct 29 13:31:31 2004 Chad Elliott <elliott_c@ociweb.com>
diff --git a/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_ServerScheduler_i.i b/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_ServerScheduler_i.i
index 2fa91e392b5..976c7639084 100644
--- a/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_ServerScheduler_i.i
+++ b/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_ServerScheduler_i.i
@@ -22,8 +22,7 @@ ACE_INLINE u_long
TAO::CosSchedulingObjectMap_Hash_Key::operator () (
const COS_SCHEDULING_OBJECT_NAME_KEY &key) const
{
- u_long value;
- value = key->_hash(LONG_MAX);
+ u_long value = key->_hash(ACE_UINT32_MAX);
return value;
}