diff options
Diffstat (limited to 'ACE')
| -rw-r--r-- | ACE/ace/Compression/rle/RLECompressor.cpp | 4 | ||||
| -rw-r--r-- | ACE/ace/Process.h | 18 | ||||
| -rw-r--r-- | ACE/ace/config-win32-borland.h | 6 | ||||
| -rw-r--r-- | ACE/tests/Compiler_Features_38_Test.cpp | 6 |
4 files changed, 23 insertions, 11 deletions
diff --git a/ACE/ace/Compression/rle/RLECompressor.cpp b/ACE/ace/Compression/rle/RLECompressor.cpp index 2bb3f627abd..43d48e844b9 100644 --- a/ACE/ace/Compression/rle/RLECompressor.cpp +++ b/ACE/ace/Compression/rle/RLECompressor.cpp @@ -1,7 +1,7 @@ #include "RLECompressor.h" #include "ace/OS_NS_string.h" -#if defined (__BORLANDC__) && (__BORLANDC__ >= 0x660) && (__BORLANDC__ <= 0x730) +#if defined (__BORLANDC__) && (__BORLANDC__ >= 0x660) && (__BORLANDC__ <= 0x740) # pragma option push -w-8072 #endif @@ -140,6 +140,6 @@ ACE_SINGLETON_TEMPLATE_INSTANTIATE(ACE_Singleton, ACE_RLECompressor, ACE_SYNCH_M // Close versioned namespace, if enabled by the user. ACE_END_VERSIONED_NAMESPACE_DECL -#if defined (__BORLANDC__) && (__BORLANDC__ >= 0x660) && (__BORLANDC__ <= 0x730) +#if defined (__BORLANDC__) && (__BORLANDC__ >= 0x660) && (__BORLANDC__ <= 0x740) # pragma option pop #endif diff --git a/ACE/ace/Process.h b/ACE/ace/Process.h index 327573513db..1465103ef63 100644 --- a/ACE/ace/Process.h +++ b/ACE/ace/Process.h @@ -118,7 +118,11 @@ public: /// @param format must be of the form "VARIABLE=VALUE". There can not be /// any spaces between VARIABLE and the equal sign. int setenv (const ACE_TCHAR *format, - ...); + ...) +#if !defined (ACE_USES_WCHAR) + ACE_GCC_FORMAT_ATTRIBUTE (printf, 2, 3) +#endif /* !ACE_USES_WCHAR */ + ; /** * Set a single environment variable, @a variable_name. Since @@ -130,7 +134,11 @@ public: */ int setenv (const ACE_TCHAR *variable_name, const ACE_TCHAR *format, - ...); + ...) +#if !defined (ACE_USES_WCHAR) + ACE_GCC_FORMAT_ATTRIBUTE (printf, 3, 4) +#endif /* !ACE_USES_WCHAR */ + ; #endif // ACE_LACKS_VA_FUNCTIONS /// Same as above with argv format. @a envp must be null terminated. @@ -155,7 +163,11 @@ public: * path to run a process, this method *must* be called! Returns 0 * on success, -1 on failure. */ - int command_line (const ACE_TCHAR *format, ...); + int command_line (const ACE_TCHAR *format, ...) +#if !defined (ACE_USES_WCHAR) + ACE_GCC_FORMAT_ATTRIBUTE (printf, 2, 3) +#endif /* !ACE_USES_WCHAR */ + ; #if defined (ACE_HAS_WCHAR) && !defined (ACE_HAS_WINCE) /// Anti-TChar version of command_line () diff --git a/ACE/ace/config-win32-borland.h b/ACE/ace/config-win32-borland.h index 47fd0dbf0d0..ea0f0d75446 100644 --- a/ACE/ace/config-win32-borland.h +++ b/ACE/ace/config-win32-borland.h @@ -145,16 +145,16 @@ # endif /* !__MT__ */ #endif /* ACE_MT_SAFE && ACE_MT_SAFE != 0 */ -#if (__BORLANDC__ <= 0x730) +#if (__BORLANDC__ <= 0x740) # define ACE_LACKS_ISWCTYPE # define ACE_LACKS_ISCTYPE #endif -#if (__BORLANDC__ >= 0x640) && (__BORLANDC__ <= 0x730) +#if (__BORLANDC__ >= 0x640) && (__BORLANDC__ <= 0x740) # define ACE_LACKS_STRTOK_R #endif -#if (__BORLANDC__ <= 0x730) +#if (__BORLANDC__ <= 0x740) # define ACE_LACKS_LOCALTIME_R # define ACE_LACKS_GMTIME_R # define ACE_LACKS_ASCTIME_R diff --git a/ACE/tests/Compiler_Features_38_Test.cpp b/ACE/tests/Compiler_Features_38_Test.cpp index 0d6466479db..1c2f901bb7d 100644 --- a/ACE/tests/Compiler_Features_38_Test.cpp +++ b/ACE/tests/Compiler_Features_38_Test.cpp @@ -4,6 +4,7 @@ */ #include "test_config.h" +#include "ace/CDR_Base.h" template <typename T> class Foo_T @@ -11,8 +12,7 @@ class Foo_T public: Foo_T () : member() {}; typedef T& T_elem; - T_elem operator[] (long) { return member; } - operator T *& () { return & member; }; + T_elem operator[] (ACE_CDR::ULong) { return member; } private: T member; }; @@ -29,7 +29,7 @@ run_main (int, ACE_TCHAR *[]) ACE_START_TEST (ACE_TEXT("Compiler_Features_38_Test")); Foo2Seq f2; - long const j = f2[0L].i; + long const j = f2[0].i; ACE_UNUSED_ARG(j); ACE_DEBUG ((LM_INFO, |