diff --git a/FACE/Fixed.h b/FACE/Fixed.h index dcfcac91160..17be2416148 100644 --- a/FACE/Fixed.h +++ b/FACE/Fixed.h @@ -251,14 +251,14 @@ inline FACE::UnsignedShort Fixed::fixed_scale() const inline void Fixed::enforce(unsigned int digits, unsigned int scale) { - impl_ = impl_.truncate(scale); + impl_ = impl_.truncate(static_cast(scale)); if (impl_.fixed_digits() > digits) { throw CORBA::DATA_CONVERSION(); } if (impl_.fixed_scale() < scale) { - const int offset = scale - impl_.fixed_scale(); - if (offset + impl_.fixed_digits() > int(digits)) { + const unsigned int offset = scale - impl_.fixed_scale(); + if (offset + impl_.fixed_digits() > digits) { throw CORBA::DATA_CONVERSION(); } diff --git a/dds/DCPS/DataReaderImpl.cpp b/dds/DCPS/DataReaderImpl.cpp index f6eb48bfc85..b4ea0d64a3a 100644 --- a/dds/DCPS/DataReaderImpl.cpp +++ b/dds/DCPS/DataReaderImpl.cpp @@ -3406,9 +3406,6 @@ EndHistoricSamplesMissedSweeper::EndHistoricSamplesMissedSweeper(ACE_Reactor* re , reader_(*reader) { } -EndHistoricSamplesMissedSweeper::~EndHistoricSamplesMissedSweeper() -{ } - void EndHistoricSamplesMissedSweeper::schedule_timer(OpenDDS::DCPS::RcHandle& info) { info->waiting_for_end_historic_samples(true); diff --git a/dds/DCPS/DataReaderImpl.h b/dds/DCPS/DataReaderImpl.h index fa2cd8329b6..de79b661f8c 100644 --- a/dds/DCPS/DataReaderImpl.h +++ b/dds/DCPS/DataReaderImpl.h @@ -142,8 +142,6 @@ class EndHistoricSamplesMissedSweeper : public ReactorInterceptor { } private: - ~EndHistoricSamplesMissedSweeper(); - WeakRcHandle reader_; OPENDDS_SET(WriterInfo_rch) info_set_; @@ -913,8 +911,6 @@ class OpenDDS_Dcps_Export DataReaderImpl } private: - ~LivelinessTimer() { } - WeakRcHandle data_reader_; /// liveliness timer id; -1 if no timer is set diff --git a/dds/DCPS/JsonValueReader.h b/dds/DCPS/JsonValueReader.h index 8aec2e8e442..49c2f62e8bf 100644 --- a/dds/DCPS/JsonValueReader.h +++ b/dds/DCPS/JsonValueReader.h @@ -433,7 +433,7 @@ bool JsonValueReader::read_int32(ACE_CDR::Long& value) value = int_value_; return consume(kInt); case kUint: - value = uint_value_; + value = static_cast(uint_value_); return consume(kUint); default: return false; @@ -458,7 +458,7 @@ bool JsonValueReader::read_int64(ACE_CDR::LongLong& value) value = int64_value_; return consume(kInt64); case kUint64: - value = uint64_value_; + value = static_cast(uint64_value_); return consume(kUint64); case kInt: value = int_value_; @@ -655,7 +655,7 @@ bool JsonValueReader::read_long_enum(ACE_CDR::Long& value, const En value = int_value_; return consume(kInt); case kUint: - value = uint_value_; + value = static_cast(uint_value_); return consume(kUint); default: return false; @@ -670,13 +670,13 @@ bool JsonValueReader::read_bitmask(ACE_CDR::ULongLong& value, const value = string_to_bitmask(string_value_, helper); return consume(kString); case kInt: - value = int_value_; + value = static_cast(int_value_); return consume(kInt); case kUint: value = uint_value_; return consume(kUint); case kInt64: - value = int64_value_; + value = static_cast(int64_value_); return consume(kInt64); case kUint64: value = uint64_value_; diff --git a/dds/DCPS/RakeResults_T.cpp b/dds/DCPS/RakeResults_T.cpp index df38ea04477..173f01e31f2 100644 --- a/dds/DCPS/RakeResults_T.cpp +++ b/dds/DCPS/RakeResults_T.cpp @@ -22,7 +22,7 @@ template RakeResults::RakeResults(DataReaderImpl* reader, SampleSeq& received_data, DDS::SampleInfoSeq& info_seq, - CORBA::Long max_samples, + CORBA::ULong max_samples, DDS::PresentationQosPolicy presentation, #ifndef OPENDDS_NO_QUERY_CONDITION DDS::QueryCondition_ptr cond, diff --git a/dds/DCPS/RakeResults_T.h b/dds/DCPS/RakeResults_T.h index 7fee17ad870..2a5872f2007 100644 --- a/dds/DCPS/RakeResults_T.h +++ b/dds/DCPS/RakeResults_T.h @@ -38,7 +38,7 @@ class RakeResults { RakeResults(DataReaderImpl* reader, SampleSeq& received_data, DDS::SampleInfoSeq& info_seq, - CORBA::Long max_samples, + CORBA::ULong max_samples, DDS::PresentationQosPolicy presentation, #ifndef OPENDDS_NO_QUERY_CONDITION DDS::QueryCondition_ptr cond, diff --git a/dds/DCPS/transport/framework/TransportClient.h b/dds/DCPS/transport/framework/TransportClient.h index b437514bade..a2aa32da951 100644 --- a/dds/DCPS/transport/framework/TransportClient.h +++ b/dds/DCPS/transport/framework/TransportClient.h @@ -263,9 +263,6 @@ class OpenDDS_Dcps_Export TransportClient } private: - ~PendingAssocTimer() - { } - class CommandBase : public Command { public: CommandBase(PendingAssocTimer* timer,