diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2009-11-30 19:11:43 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2009-11-30 19:11:43 +0000 |
| commit | 21a63e7a5a36ee3a01fae99102bf489b8f3b64cf (patch) | |
| tree | 7fe83994f9c6618e3e84e142b5cc92353c38ae27 | |
| parent | 3ef4579846eab409b26963b1e272a521cfef54ce (diff) | |
| download | ATCD-21a63e7a5a36ee3a01fae99102bf489b8f3b64cf.tar.gz | |
Mon Nov 30 19:11:00 UTC 2009 Johnny Willemsen <jwillemsen@remedy.nl>
* apps/gperf/src/Bool_Array.h:
* apps/gperf/src/Key_List.h:
C++ Builder 2010 fixes
| -rw-r--r-- | ACE/ChangeLog | 6 | ||||
| -rw-r--r-- | ACE/apps/gperf/src/Bool_Array.h | 4 | ||||
| -rw-r--r-- | ACE/apps/gperf/src/Key_List.h | 4 |
3 files changed, 10 insertions, 4 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog index 0fb93406717..085ee04950a 100644 --- a/ACE/ChangeLog +++ b/ACE/ChangeLog @@ -1,3 +1,9 @@ +Mon Nov 30 19:11:00 UTC 2009 Johnny Willemsen <jwillemsen@remedy.nl> + + * apps/gperf/src/Bool_Array.h: + * apps/gperf/src/Key_List.h: + C++ Builder 2010 fixes + Mon Nov 30 14:02:00 UTC 2009 Johnny Willemsen <jwillemsen@remedy.nl> * ace/Process.cpp: diff --git a/ACE/apps/gperf/src/Bool_Array.h b/ACE/apps/gperf/src/Bool_Array.h index 76c600a088d..bf5a9ccb810 100644 --- a/ACE/apps/gperf/src/Bool_Array.h +++ b/ACE/apps/gperf/src/Bool_Array.h @@ -36,7 +36,7 @@ #if defined (ACE_HAS_GPERF) -#if defined (__BORLANDC__) && (__BORLANDC__ < 0x620) +#if defined (__BORLANDC__) && (__BORLANDC__ <= 0x620) #include "gperf_export.h" #endif @@ -47,7 +47,7 @@ * Uses a "Generation Numbering" implementation to minimize * initialization time. */ -#if defined (__BORLANDC__) && (__BORLANDC__ < 0x620) +#if defined (__BORLANDC__) && (__BORLANDC__ <= 0x620) class ACE_GPERF_Export Bool_Array #else class Bool_Array diff --git a/ACE/apps/gperf/src/Key_List.h b/ACE/apps/gperf/src/Key_List.h index ef64f188f6f..149ac28d339 100644 --- a/ACE/apps/gperf/src/Key_List.h +++ b/ACE/apps/gperf/src/Key_List.h @@ -34,7 +34,7 @@ #include "Vectors.h" #include "ace/Copy_Disabled.h" -#if defined (__BORLANDC__) && (__BORLANDC__ < 0x620) +#if defined (__BORLANDC__) && (__BORLANDC__ <= 0x620) #include "gperf_export.h" #endif @@ -64,7 +64,7 @@ public: * the Gen_Perf.hash function. A Key_List is a singly-linked list * of List_Nodes. */ -#if defined (__BORLANDC__) && (__BORLANDC__ < 0x620) +#if defined (__BORLANDC__) && (__BORLANDC__ <= 0x620) class ACE_GPERF_Export Key_List : private ACE_Copy_Disabled #else class Key_List : private ACE_Copy_Disabled |