diff options
| author | Ossama Othman <ossama-othman@users.noreply.github.com> | 2005-04-23 06:03:43 +0000 |
|---|---|---|
| committer | Ossama Othman <ossama-othman@users.noreply.github.com> | 2005-04-23 06:03:43 +0000 |
| commit | 2eadc71f85ccf6fa5fad7916b40961acbf117cf7 (patch) | |
| tree | 1894b1a1c1858183ea336ee992ddc500207f009f | |
| parent | b311e94699b59e0bc08173c07e2b08998d76a4ca (diff) | |
| download | ATCD-2eadc71f85ccf6fa5fad7916b40961acbf117cf7.tar.gz | |
ChangeLogTag:Fri Apr 22 23:02:33 2005 Ossama Othman <ossama@dre.vanderbilt.edu>
4 files changed, 17 insertions, 7 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index ddca2de3a35..e785dc2d25a 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,13 @@ +Fri Apr 22 23:02:33 2005 Ossama Othman <ossama@dre.vanderbilt.edu> + + * orbsvcs/orbsvcs/FtRtEvent/EventChannel/Dynamic_Bitset.h + * orbsvcs/orbsvcs/FtRtEvent/EventChannel/Dynamic_Bitset.inl: + * orbsvcs/orbsvcs/FtRtEvent/EventChannel/Dynamic_Bitset.cpp + (Dynamic_Bitset): + + Reordered class attributes to fix "variable is used + uninitialized" ("is" not "may be"!) g++ 4.0 warning. + Fri Apr 22 22:49:13 2005 Ossama Othman <ossama@dre.vanderbilt.edu> * orbsvcs/orbsvcs/LoadBalancing/LB_LoadMinimum.cpp @@ -5,7 +15,7 @@ Fri Apr 22 22:49:13 2005 Ossama Othman <ossama@dre.vanderbilt.edu> * orbsvcs/orbsvcs/LoadBalancing/LB_LoadAverage.cpp (analyze_loads): - Fixed "variable may be used initialized" g++ 4.0 warnings. In + Fixed "variable may be used uninitialized" g++ 4.0 warnings. In this case, the variable was indeed used undefined! Fri Apr 22 20:00:28 2005 J.T. Conklin <jtc@acorntoolworks.com> diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Dynamic_Bitset.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Dynamic_Bitset.cpp index c3fd2eae485..855d3401a9c 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Dynamic_Bitset.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Dynamic_Bitset.cpp @@ -14,9 +14,9 @@ inline unsigned ceil(unsigned numerator, unsigned denominator) } Dynamic_Bitset::Dynamic_Bitset(Dynamic_Bitset::size_type size) -: buffer_(new block[buffer_size_]) -, buffer_size_(ceil(size,BITS_PER_BLOCK)) -, bit_size_(size) + : buffer_size_(ceil(size,BITS_PER_BLOCK)) + , buffer_(new block[buffer_size_]) + , bit_size_(size) { memset(buffer_, 0, buffer_size_*BYTES_PER_BLOCK); } diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Dynamic_Bitset.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Dynamic_Bitset.h index e2cf37a7509..edab64a90b6 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Dynamic_Bitset.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Dynamic_Bitset.h @@ -56,8 +56,8 @@ public: friend bool operator == (const Dynamic_Bitset& lhs, const Dynamic_Bitset& rhs); private: - block* buffer_; size_type buffer_size_; + block* buffer_; size_type bit_size_; }; diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Dynamic_Bitset.inl b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Dynamic_Bitset.inl index 425e8cba0b4..3f92a979855 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Dynamic_Bitset.inl +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Dynamic_Bitset.inl @@ -18,8 +18,8 @@ Dynamic_Bitset::~Dynamic_Bitset() ACE_INLINE Dynamic_Bitset::Dynamic_Bitset(const Dynamic_Bitset& other) - : buffer_(new block[other.buffer_size_]) - , buffer_size_(other.buffer_size_) + : buffer_size_(other.buffer_size_) + , buffer_(new block[other.buffer_size_]) , bit_size_(other.bit_size_) { ACE_OS::memcpy(buffer_, other.buffer_, buffer_size_*BYTES_PER_BLOCK); |