diff options
author | Johnny Willemsen <jwillemsen@remedy.nl> | 2007-01-30 12:04:13 +0000 |
---|---|---|
committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2007-01-30 12:04:13 +0000 |
commit | e16327bff7176821f2b672ce46084bdaed364d44 (patch) | |
tree | c88f2bae8d98537963112e5781bee23f970a83d1 /TAO | |
parent | 802a1d1845b14bf16944763fbfb05b7bb23e93d8 (diff) | |
download | ATCD-e16327bff7176821f2b672ce46084bdaed364d44.tar.gz |
Tue Jan 30 12:03:14 2007 Johnny Willemsen <jwillemsen@remedy.nl>
Diffstat (limited to 'TAO')
-rw-r--r-- | TAO/ChangeLog | 5 | ||||
-rw-r--r-- | TAO/tao/Compression/Compressor_Factory.cpp | 31 | ||||
-rw-r--r-- | TAO/tao/Compression/Compressor_Factory.h | 31 |
3 files changed, 24 insertions, 43 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 2892554a19e..c1ab03f769c 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,8 @@ +Tue Jan 30 12:03:14 2007 Johnny Willemsen <jwillemsen@remedy.nl> + + * tao/Compression/Compressor_Factory.{h,cpp}: + Fixed layout and warnings in single threaded build + Tue Jan 30 11:14:14 2007 Johnny Willemsen <jwillemsen@remedy.nl> * tao/PortableServer/Direct_Collocation_Upcall_Wrapper.cpp: diff --git a/TAO/tao/Compression/Compressor_Factory.cpp b/TAO/tao/Compression/Compressor_Factory.cpp index 89db794c56f..4a796ab8209 100644 --- a/TAO/tao/Compression/Compressor_Factory.cpp +++ b/TAO/tao/Compression/Compressor_Factory.cpp @@ -17,37 +17,30 @@ CompressorFactory::CompressorFactory (::Compression::CompressorId compressor_id) ::Compression::CompressorId CompressorFactory::compressor_id (void) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) + ACE_THROW_SPEC ((::CORBA::SystemException)) { return compressor_id_; } ::CORBA::ULongLong CompressorFactory::compressed_bytes (void) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) + ACE_THROW_SPEC ((::CORBA::SystemException)) { ::CORBA::ULongLong return_value; { - ACE_Guard <ACE_SYNCH_MUTEX> guard (mutex_); + ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->mutex_, 0); return_value = compressed_bytes_; } return return_value; } ::CORBA::ULongLong -CompressorFactory::uncompressed_bytes ( - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) +CompressorFactory::uncompressed_bytes (void) + ACE_THROW_SPEC ((::CORBA::SystemException)) { ::CORBA::ULongLong return_value; { - ACE_Guard <ACE_SYNCH_MUTEX> guard (mutex_); + ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->mutex_, 0); return_value = uncompressed_bytes_; } return return_value; @@ -55,13 +48,11 @@ CompressorFactory::uncompressed_bytes ( ::CORBA::Double CompressorFactory::average_compression (void) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) + ACE_THROW_SPEC ((::CORBA::SystemException)) { ::CORBA::Double return_value = 0.0; { - ACE_Guard <ACE_SYNCH_MUTEX> guard (mutex_); + ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->mutex_, 0); if (this->uncompressed_bytes_ > 0) { return_value = static_cast < ::CORBA::Double>((this->uncompressed_bytes_ - this->compressed_bytes_) / this->uncompressed_bytes_); @@ -74,11 +65,9 @@ void CompressorFactory::add_sample ( ::CORBA::ULongLong compressed_bytes, ::CORBA::ULongLong uncompressed_bytes) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) + ACE_THROW_SPEC ((::CORBA::SystemException)) { - ACE_Guard <ACE_SYNCH_MUTEX> guard (mutex_); + ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->mutex_); this->compressed_bytes_ += compressed_bytes; this->uncompressed_bytes_ += uncompressed_bytes; } diff --git a/TAO/tao/Compression/Compressor_Factory.h b/TAO/tao/Compression/Compressor_Factory.h index fa81e71d0dd..a7951189868 100644 --- a/TAO/tao/Compression/Compressor_Factory.h +++ b/TAO/tao/Compression/Compressor_Factory.h @@ -23,7 +23,6 @@ #include "tao/Compression/Compression.h" #include "tao/LocalObject.h" -#include "ace/Synch_Traits.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL @@ -40,38 +39,26 @@ namespace TAO ACE_THROW_SPEC (( ::CORBA::SystemException)); virtual ::CORBA::ULongLong compressed_bytes (void) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ACE_THROW_SPEC ((::CORBA::SystemException)); virtual ::CORBA::ULongLong uncompressed_bytes (void) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ACE_THROW_SPEC ((::CORBA::SystemException)); virtual ::CORBA::Double average_compression (void) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ACE_THROW_SPEC ((::CORBA::SystemException)); virtual ::Compression::Compressor_ptr get_compressor ( - ::Compression::CompressionLevel compression_level - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )) = 0; + ::Compression::CompressionLevel compression_level) + ACE_THROW_SPEC ((::CORBA::SystemException)) = 0; virtual void add_sample ( ::CORBA::ULongLong compressed_bytes, - ::CORBA::ULongLong uncompressed_bytes - ) - ACE_THROW_SPEC (( - ::CORBA::SystemException - )); + ::CORBA::ULongLong uncompressed_bytes) + ACE_THROW_SPEC ((::CORBA::SystemException)); private: - ACE_SYNCH_MUTEX mutex_; - ::Compression::CompressorId compressor_id_; + TAO_SYNCH_MUTEX mutex_; + ::Compression::CompressorId const compressor_id_; ::CORBA::ULongLong compressed_bytes_; ::CORBA::ULongLong uncompressed_bytes_; }; |