diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2009-06-02 13:14:14 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2009-06-02 13:14:14 +0000 |
| commit | 2f706f7b2fa0fecd9f3c91603a2b6be42811d7e3 (patch) | |
| tree | f1c3bdcadb27dd456208751bdca35afdff898aed | |
| parent | 67a10971a415c3ed37509582310a93a2fd15bf45 (diff) | |
| download | ATCD-2f706f7b2fa0fecd9f3c91603a2b6be42811d7e3.tar.gz | |
Tue Jun 2 13:14:50 UTC 2009 Johnny Willemsen <jwillemsen@remedy.nl>
* orbsvcs/orbsvcs/IFRService/IFR_Service_Utils_T.cpp
* orbsvcs/orbsvcs/Trader/Trader.h
Fixed problems with CB2009 Update 3
| -rw-r--r-- | TAO/ChangeLog | 6 | ||||
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils_T.cpp | 2 | ||||
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/Trader/Trader.h | 4 |
3 files changed, 9 insertions, 3 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index eac36749514..37e66cb9d7d 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,9 @@ +Tue Jun 2 13:14:50 UTC 2009 Johnny Willemsen <jwillemsen@remedy.nl> + + * orbsvcs/orbsvcs/IFRService/IFR_Service_Utils_T.cpp + * orbsvcs/orbsvcs/Trader/Trader.h + Fixed problems with CB2009 Update 3 + Tue Jun 2 07:21:50 UTC 2009 Johnny Willemsen <jwillemsen@remedy.nl> * orbsvcs/tests/Notify/Bug_3646d_Regression/*: diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils_T.cpp b/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils_T.cpp index 8817ed8f766..0129e09dada 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils_T.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils_T.cpp @@ -344,7 +344,7 @@ TAO_Port_Utils<T>::create_entry (const char *id, return T::_narrow (obj.in ()); } -#if defined (__BORLANDC__) && (__BORLANDC__ <= 0x610) +#if defined (__BORLANDC__) && (__BORLANDC__ < 0x620) // Borland gives warnings about argument not used on the construct as used // for the other compilers. This has been reported to Borland, adding // a workaround to suppress these warnings so that the real important ones diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trader.h b/TAO/orbsvcs/orbsvcs/Trader/Trader.h index 69b6299895f..19a33bdfc02 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Trader.h +++ b/TAO/orbsvcs/orbsvcs/Trader/Trader.h @@ -124,7 +124,7 @@ private: * Class used to remove the circular dependencies between the * Attribute classes and the Trader class. */ -#if defined (__BORLANDC__) && (__BORLANDC__ <= 0x610) +#if defined (__BORLANDC__) && (__BORLANDC__ < 0x620) // Work around Borland unresolved symbol errors concerning the // out-of-line virtual destructor. The virtual destructor should // not be inlined, nor should we have to export TAO_Lockable from the @@ -132,7 +132,7 @@ private: class TAO_Trading_Serv_Export TAO_Lockable #else class TAO_Lockable -#endif /* __BORLANDC__ <= 0x610 */ +#endif /* __BORLANDC__ < 0x620 */ { public: virtual ~TAO_Lockable (void); |