diff options
Diffstat (limited to 'CIAO/connectors/dds4ccm/impl/ndds/Time_t.h')
| -rw-r--r-- | CIAO/connectors/dds4ccm/impl/ndds/Time_t.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/Time_t.h b/CIAO/connectors/dds4ccm/impl/ndds/Time_t.h index f71f776ef7b..da7d447206b 100644 --- a/CIAO/connectors/dds4ccm/impl/ndds/Time_t.h +++ b/CIAO/connectors/dds4ccm/impl/ndds/Time_t.h @@ -10,10 +10,11 @@ #ifndef CIAO_RTI_TIME_T_H #define CIAO_RTI_TIME_T_H -#if defined (DDS_MAJOR_VERSION) +#if defined (CIAO_DDS4CCM_OPENDDS) && (CIAO_DDS4CCM_OPENDDS==1) typedef ::DDS::Time_t DDS_Time_t; #endif +#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1) inline void operator<<= (::DDS::Time_t &ddstime, const ::DDS_Time_t & time) { @@ -21,14 +22,12 @@ operator<<= (::DDS::Time_t &ddstime, const ::DDS_Time_t & time) ddstime.nanosec = time.nanosec; } -#if !defined (DDS_MAJOR_VERSION) inline void operator<<= (::DDS_Time_t &ddstime, const ::DDS::Time_t & time) { ddstime.sec = time.sec; ddstime.nanosec = time.nanosec; } -#endif inline void operator>>= (const ::DDS_Time_t &time, ::DDS::Time_t & ddstime) @@ -36,6 +35,7 @@ operator>>= (const ::DDS_Time_t &time, ::DDS::Time_t & ddstime) ddstime.sec = time.sec; ddstime.nanosec = time.nanosec; } +#endif #endif /* CIAO_RTI_TIME_T_H */ |