diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2010-01-27 09:41:29 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2010-01-27 09:41:29 +0000 |
| commit | 5cb965658cb93c038fc08e470219543ba4e5b56c (patch) | |
| tree | a8672f4dea88cb9f971c1c40954b76bf13943f44 | |
| parent | a4ecd3831235e57a4ca1955b4aa2f06110914721 (diff) | |
| download | ATCD-5cb965658cb93c038fc08e470219543ba4e5b56c.tar.gz | |
Wed Jan 27 09:41:27 UTC 2010 Johnny Willemsen <jwillemsen@remedy.nl>
* connectors/dds4ccm/impl/ndds/TimeUtilities.h:
Fixed msvc warnings
| -rw-r--r-- | CIAO/ChangeLog | 5 | ||||
| -rw-r--r-- | CIAO/connectors/dds4ccm/impl/ndds/TimeUtilities.h | 4 |
2 files changed, 7 insertions, 2 deletions
diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog index 400dea8f929..9f6246bccfb 100644 --- a/CIAO/ChangeLog +++ b/CIAO/ChangeLog @@ -1,3 +1,8 @@ +Wed Jan 27 09:41:27 UTC 2010 Johnny Willemsen <jwillemsen@remedy.nl> + + * connectors/dds4ccm/impl/ndds/TimeUtilities.h: + Fixed msvc warnings + Wed Jan 27 08:34:36 UTC 2010 Marcel Smit <msmit@remedy.nl> * connectors/dds4ccm/tests/CSLSampleRejected/Sender/CSL_SRTest_Sender_exec.cpp: diff --git a/CIAO/connectors/dds4ccm/impl/ndds/TimeUtilities.h b/CIAO/connectors/dds4ccm/impl/ndds/TimeUtilities.h index f72f34c8c52..ac6827b76b7 100644 --- a/CIAO/connectors/dds4ccm/impl/ndds/TimeUtilities.h +++ b/CIAO/connectors/dds4ccm/impl/ndds/TimeUtilities.h @@ -29,7 +29,7 @@ inline void operator<<= (::DDS::Time_t & dds_time, const ::ACE_Time_Value & ace_time) { - dds_time.sec = ace_time.sec (); + dds_time.sec = static_cast < ::CORBA::Long> (ace_time.sec ()); dds_time.nanosec = ace_time.usec () * 1000; } @@ -50,7 +50,7 @@ operator>>= (const ::DDS::Time_t & dds_time, ::ACE_Time_Value & ace_time) inline void operator>>= (const ::ACE_Time_Value & ace_time, ::DDS::Time_t &dds_time) { - dds_time.sec = ace_time.sec (); + dds_time.sec = static_cast < ::CORBA::Long> (ace_time.sec ()); dds_time.nanosec = ace_time.usec () * 1000; } |