diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2010-08-09 06:42:23 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2010-08-09 06:42:23 +0000 |
| commit | c5542f4a9f81002cb3b83d542584ea6565888cb7 (patch) | |
| tree | 9441193235f16a7f463cb2bf1c7a0253d4d1b2d4 | |
| parent | 24846517a7c7ac3eb94e4ef2cb7399ab5e72bd7b (diff) | |
| download | ATCD-c5542f4a9f81002cb3b83d542584ea6565888cb7.tar.gz | |
Mon Aug 9 06:42:10 UTC 2010 Johnny Willemsen <jwillemsen@remedy.nl>
* connectors/dds4ccm/impl/ConditionManager_T.h:
* connectors/dds4ccm/impl/DDS4CCM_LocalObject_T.h:
Removed not needed semi colons
| -rw-r--r-- | CIAO/ChangeLog | 6 | ||||
| -rw-r--r-- | CIAO/connectors/dds4ccm/impl/ConditionManager_T.h | 4 | ||||
| -rw-r--r-- | CIAO/connectors/dds4ccm/impl/DDS4CCM_LocalObject_T.h | 4 | ||||
| -rw-r--r-- | CIAO/connectors/dds4ccm/impl/Reader_T.cpp | 2 |
4 files changed, 11 insertions, 5 deletions
diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog index c74b19bb09f..971a6682d6a 100644 --- a/CIAO/ChangeLog +++ b/CIAO/ChangeLog @@ -1,3 +1,9 @@ +Mon Aug 9 06:42:10 UTC 2010 Johnny Willemsen <jwillemsen@remedy.nl> + + * connectors/dds4ccm/impl/ConditionManager_T.h: + * connectors/dds4ccm/impl/DDS4CCM_LocalObject_T.h: + Removed not needed semi colons + Sun Aug 8 12:46:54 UTC 2010 Johnny Willemsen <jwillemsen@remedy.nl> * connectors/dds4ccm/impl/DDS_Listen_T.cpp: diff --git a/CIAO/connectors/dds4ccm/impl/ConditionManager_T.h b/CIAO/connectors/dds4ccm/impl/ConditionManager_T.h index 5f88e080797..60e8c02aec1 100644 --- a/CIAO/connectors/dds4ccm/impl/ConditionManager_T.h +++ b/CIAO/connectors/dds4ccm/impl/ConditionManager_T.h @@ -79,8 +79,8 @@ namespace CIAO void set_parameters (const ::CCM_DDS::QueryFilter & filter, ::DDS::QueryCondition_ptr qc); }; - }; -}; + } +} #include "dds4ccm/impl/ConditionManager_T.cpp" diff --git a/CIAO/connectors/dds4ccm/impl/DDS4CCM_LocalObject_T.h b/CIAO/connectors/dds4ccm/impl/DDS4CCM_LocalObject_T.h index 66fa2a3471f..d12ee2f24fe 100644 --- a/CIAO/connectors/dds4ccm/impl/DDS4CCM_LocalObject_T.h +++ b/CIAO/connectors/dds4ccm/impl/DDS4CCM_LocalObject_T.h @@ -24,8 +24,8 @@ namespace CIAO private: typename CCM_TYPE::base_type::_var_type component_; }; - }; -}; + } +} #include "dds4ccm/impl/DDS4CCM_LocalObject_T.cpp" diff --git a/CIAO/connectors/dds4ccm/impl/Reader_T.cpp b/CIAO/connectors/dds4ccm/impl/Reader_T.cpp index 32028d49f55..aa8cface392 100644 --- a/CIAO/connectors/dds4ccm/impl/Reader_T.cpp +++ b/CIAO/connectors/dds4ccm/impl/Reader_T.cpp @@ -204,7 +204,7 @@ CIAO::DDS4CCM::DDS_CCM::Reader_T<DDS_TYPE, CCM_TYPE, FIXED, VENDOR_TYPE>::read_o } // Return the loan DDS_ReturnCode_t const retval = this->impl ()->return_loan (data, sample_info); - if (retval != DDS_RETCODE_OK) + if (retval != ::DDS::RETCODE_OK) { DDS4CCM_ERROR (DDS4CCM_LOG_LEVEL_ERROR, (LM_ERROR, CLINFO "CIAO::DDS4CCM::DDS_CCM::Reader_T::read_one_last - " |