diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2006-03-02 14:52:59 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2006-03-02 14:52:59 +0000 |
| commit | 9582627972e379b800e5288f81c9fe36640000e6 (patch) | |
| tree | ed6c0eaca9402baf00ad44cbf19683dbbf336973 | |
| parent | ac27479443cc74b098d85be3700153c59c9601a8 (diff) | |
| download | ATCD-9582627972e379b800e5288f81c9fe36640000e6.tar.gz | |
ChangeLogTag: Thu Mar 2 13:52:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl>
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/Trader/Trader.h | 2 | ||||
| -rwxr-xr-x | TAO/tao/Incoming_Message_Stack.h | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trader.h b/TAO/orbsvcs/orbsvcs/Trader/Trader.h index e5de9c37f28..eac0af63978 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__ <= 0x581) +#if defined (__BORLANDC__) && (__BORLANDC__ <= 0x582) // 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 diff --git a/TAO/tao/Incoming_Message_Stack.h b/TAO/tao/Incoming_Message_Stack.h index f31ea14761d..db6f5a7a912 100755 --- a/TAO/tao/Incoming_Message_Stack.h +++ b/TAO/tao/Incoming_Message_Stack.h @@ -21,7 +21,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#if defined (__BORLANDC__) && ((__BORLANDC__ == 0x564) || (__BORLANDC__ == 0x581)) +#if defined (__BORLANDC__) && (__BORLANDC__ <= 0x582) #include "tao/TAO_Export.h" #endif @@ -41,7 +41,7 @@ namespace TAO * Internal class, providing stack functionality for TAO_Queued_Data * objects. Stack operations don't require memory allocation. */ -#if defined (__BORLANDC__) && ((__BORLANDC__ == 0x564) || (__BORLANDC__ == 0x581)) +#if defined (__BORLANDC__) && (__BORLANDC__ <= 0x582) class TAO_Export Incoming_Message_Stack #else class Incoming_Message_Stack |