diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2009-06-01 08:09:31 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2009-06-01 08:09:31 +0000 |
| commit | e8377a9a8b199d4a1e37a5683e2ec3cb01fbf8a6 (patch) | |
| tree | ec2333fb66e8531d30fa02809848d3ededa5ec36 | |
| parent | 75dbb2410fb5cc69c0d96d294b80b24013a23d42 (diff) | |
| download | ATCD-e8377a9a8b199d4a1e37a5683e2ec3cb01fbf8a6.tar.gz | |
Mon Jun 1 08:09:05 2009 Johnny Willemsen <jwillemsen@remedy.nl>
* ace/Lib_Find.cpp:
Fixed gcc4.4 warning in a different way, broke other builds
* ace/config-win32-borland.h:
Changed version checks to not have to patch again for a next
path from Embarcadero
| -rw-r--r-- | ACE/ChangeLog | 9 | ||||
| -rw-r--r-- | ACE/ace/Lib_Find.cpp | 2 | ||||
| -rw-r--r-- | ACE/ace/config-win32-borland.h | 4 |
3 files changed, 12 insertions, 3 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog index 34d4d7a7a16..cbd73542852 100644 --- a/ACE/ChangeLog +++ b/ACE/ChangeLog @@ -1,3 +1,12 @@ +Mon Jun 1 08:09:05 2009 Johnny Willemsen <jwillemsen@remedy.nl> + + * ace/Lib_Find.cpp: + Fixed gcc4.4 warning in a different way, broke other builds + + * ace/config-win32-borland.h: + Changed version checks to not have to patch again for a next + path from Embarcadero + Mon Jun 1 05:22:05 2009 Johnny Willemsen <jwillemsen@remedy.nl> * ace/Lib_Find.cpp: diff --git a/ACE/ace/Lib_Find.cpp b/ACE/ace/Lib_Find.cpp index 86ac1596f34..49cc12d8b27 100644 --- a/ACE/ace/Lib_Find.cpp +++ b/ACE/ace/Lib_Find.cpp @@ -377,7 +377,7 @@ ACE::ldfind (const ACE_TCHAR* filename, #else ACE_TCHAR *ld_path = 0; # if defined ACE_DEFAULT_LD_SEARCH_PATH - ld_path = ACE_DEFAULT_LD_SEARCH_PATH; + ld_path = const_cast <ACE_TCHAR*> (ACE_DEFAULT_LD_SEARCH_PATH); # else # if defined (ACE_WIN32) || !defined (ACE_USES_WCHAR) ld_path = ACE_OS::getenv (ACE_LD_SEARCH_PATH); diff --git a/ACE/ace/config-win32-borland.h b/ACE/ace/config-win32-borland.h index 8a7be5bbc00..62c474907ad 100644 --- a/ACE/ace/config-win32-borland.h +++ b/ACE/ace/config-win32-borland.h @@ -139,7 +139,7 @@ # endif /* !_MT && !ACE_HAS_WINCE */ #endif /* ACE_MT_SAFE && ACE_MT_SAFE != 0 */ -#if (__BORLANDC__ <= 0x613) +#if (__BORLANDC__ < 0x620) # define ACE_LACKS_ISBLANK # define ACE_LACKS_ISWBLANK # define ACE_LACKS_ISWCTYPE @@ -148,7 +148,7 @@ #define ACE_LACKS_ISCTYPE -#if (__BORLANDC__ <= 0x613) +#if (__BORLANDC__ < 0x620) // Older Borland compilers can't handle assembly in inline methods or // templates (E2211). When we build for pentium optimized and we are inlining // then we disable inline assembly |