diff options
30 files changed, 54 insertions, 5 deletions
diff --git a/ace/README b/ace/README index 2337fd4393a..7dbb2f40566 100644 --- a/ace/README +++ b/ace/README @@ -200,6 +200,8 @@ ACE_LACKS_UNIX_DOMAIN_SOCKETS ACE platform has no UNIX domain sockets ACE_LACKS_UTSNAME_T Platform lacks struct utsname (e.g., Win32 and VxWorks) ACE_MT_SAFE Compile using multi-thread libraries ACE_NDEBUG Turns off debugging features +ACE_NEEDS_DEV_IO_CONVERSION Necessary with some compilers + to pass ACE_TTY_IO as parameter to DEV_Connector. ACE_NEEDS_HUGE_THREAD_STACKSIZE Required by platforms with small default stacks. ACE_NEEDS_READV Platform doesn't define readv, so use our own ACE_NEEDS_SYSTIME_H <time.h> doesn't automatically #include /**/ <sys/time.h> diff --git a/ace/TTY_IO.cpp b/ace/TTY_IO.cpp index 27730bf509f..ac8d1cd2871 100644 --- a/ace/TTY_IO.cpp +++ b/ace/TTY_IO.cpp @@ -224,8 +224,9 @@ ACE_TTY_IO::control (Control_Mode cmd, #endif /* ACE_HAS_TERM_IOCTLS */ } +#if defined (ACE_NEEDS_DEV_IO_CONVERSION) ACE_TTY_IO::operator ACE_DEV_IO &() { return (ACE_DEV_IO &) *this; } - +#endif /* ACE_NEEDS_DEV_IO_CONVERSION */ diff --git a/ace/TTY_IO.h b/ace/TTY_IO.h index b4c6268572c..fba33fdc797 100644 --- a/ace/TTY_IO.h +++ b/ace/TTY_IO.h @@ -58,8 +58,10 @@ public: int control (Control_Mode cmd, Serial_Params * arg) const; // Interface for reading/writing serial device parameters. +#if defined (ACE_NEEDS_DEV_IO_CONVERSION) operator ACE_DEV_IO &(); // This is necessary to pass ACE_TTY_IO as parameter to DEV_Connector. +#endif /* ACE_NEEDS_DEV_IO_CONVERSION */ }; #endif /* ACE_TTY_H */ diff --git a/ace/config-aix-3.2.5.h b/ace/config-aix-3.2.5.h index dbb7d5e725c..2ab73303c56 100644 --- a/ace/config-aix-3.2.5.h +++ b/ace/config-aix-3.2.5.h @@ -21,6 +21,7 @@ #define ACE_HAS_POSIX_NONBLOCK #define ACE_HAS_AIX_GETTIMEOFDAY #define ACE_HAS_NO_SYSCALL_H +#define ACE_NEEDS_DEV_IO_CONVERSION // Compiler/platform has the getrusage() system call. #define ACE_HAS_GETRUSAGE diff --git a/ace/config-aix-4.1.x.h b/ace/config-aix-4.1.x.h index 25963ce9bbb..61774da4d9e 100644 --- a/ace/config-aix-4.1.x.h +++ b/ace/config-aix-4.1.x.h @@ -48,6 +48,7 @@ #define ACE_MT_SAFE #define ACE_HAS_UTIME #define ACE_HAS_SELECT_H +#define ACE_NEEDS_DEV_IO_CONVERSION #define ACE_HAS_MSG diff --git a/ace/config-aix-4.2.x.h b/ace/config-aix-4.2.x.h index eeda4254be5..cbe3d396e9a 100644 --- a/ace/config-aix-4.2.x.h +++ b/ace/config-aix-4.2.x.h @@ -48,6 +48,7 @@ #define ACE_MT_SAFE #define ACE_HAS_UTIME #define ACE_HAS_SELECT_H +#define ACE_NEEDS_DEV_IO_CONVERSION #define ACE_HAS_MSG // #define ACE_LACKS_RECVMSG diff --git a/ace/config-hpux-10.x-aCC.h b/ace/config-hpux-10.x-aCC.h index 540d31882a6..1a4e6ddbb90 100644 --- a/ace/config-hpux-10.x-aCC.h +++ b/ace/config-hpux-10.x-aCC.h @@ -114,6 +114,8 @@ // Platform supports ACE_TLI. #define ACE_HAS_TLI +#define ACE_NEEDS_DEV_IO_CONVERSION + // Turns off the tracing feature. #if !defined (ACE_NTRACE) #define ACE_NTRACE 1 diff --git a/ace/config-hpux-10.x.h b/ace/config-hpux-10.x.h index 78ac070cf20..6a38fac16ca 100644 --- a/ace/config-hpux-10.x.h +++ b/ace/config-hpux-10.x.h @@ -113,6 +113,8 @@ // Platform supports ACE_TLI. #define ACE_HAS_TLI +#define ACE_NEEDS_DEV_IO_CONVERSION + // Turns off the tracing feature. #if !defined (ACE_NTRACE) #define ACE_NTRACE 1 diff --git a/ace/config-hpux-9.x-orbix.h b/ace/config-hpux-9.x-orbix.h index 1251072120c..c46cb00548e 100644 --- a/ace/config-hpux-9.x-orbix.h +++ b/ace/config-hpux-9.x-orbix.h @@ -86,6 +86,8 @@ // Platform has the XLI version of ACE_TLI. // #define ACE_HAS_XLI +#define ACE_NEEDS_DEV_IO_CONVERSION + // Turns off the tracing feature. #if !defined (ACE_NTRACE) #define ACE_NTRACE 1 diff --git a/ace/config-hpux-9.x.h b/ace/config-hpux-9.x.h index 3f9e54452b1..0679c810161 100644 --- a/ace/config-hpux-9.x.h +++ b/ace/config-hpux-9.x.h @@ -80,6 +80,8 @@ // Platform has the XLI version of ACE_TLI. // #define ACE_HAS_XLI +#define ACE_NEEDS_DEV_IO_CONVERSION + // Turns off the tracing feature. #if !defined (ACE_NTRACE) #define ACE_NTRACE 1 diff --git a/ace/config-irix5.2.h b/ace/config-irix5.2.h index f7380391ceb..da4b26a020e 100644 --- a/ace/config-irix5.2.h +++ b/ace/config-irix5.2.h @@ -54,6 +54,7 @@ #define ACE_HAS_SYS_SIGLIST #define ACE_HAS_SYS_FILIO_H #define ACE_HAS_SEMUN +#define ACE_NEEDS_DEV_IO_CONVERSION // Turns off the tracing feature. #if !defined (ACE_NTRACE) diff --git a/ace/config-irix5.3-sgic++.h b/ace/config-irix5.3-sgic++.h index 25bf202814f..e11b7393490 100644 --- a/ace/config-irix5.3-sgic++.h +++ b/ace/config-irix5.3-sgic++.h @@ -106,6 +106,8 @@ // Platform supports IP multicast #define ACE_HAS_IP_MULTICAST +#define ACE_NEEDS_DEV_IO_CONVERSION + // Turns off the tracing feature. #if !defined (ACE_NTRACE) #define ACE_NTRACE 1 diff --git a/ace/config-mvs.h b/ace/config-mvs.h index 4d5b32499d1..2fcaebd5ca2 100644 --- a/ace/config-mvs.h +++ b/ace/config-mvs.h @@ -196,6 +196,8 @@ // Compile using multi-threaded libraries #define ACE_MT_SAFE +#define ACE_NEEDS_DEV_IO_CONVERSION + // <time.h> doesn't automatically #include <sys/time.h> #define ACE_NEEDS_SYSTIME_H diff --git a/ace/config-osf1-3.2.h b/ace/config-osf1-3.2.h index b6d3f10d5f4..0dad2478268 100644 --- a/ace/config-osf1-3.2.h +++ b/ace/config-osf1-3.2.h @@ -154,6 +154,8 @@ // Compile using multi-thread libraries. #define ACE_MT_SAFE +#define ACE_NEEDS_DEV_IO_CONVERSION + // Turns off the tracing feature. #if !defined (ACE_NTRACE) #define ACE_NTRACE 1 diff --git a/ace/config-osf1-4.0.h b/ace/config-osf1-4.0.h index 17ca960b3f9..e3cf41dc006 100644 --- a/ace/config-osf1-4.0.h +++ b/ace/config-osf1-4.0.h @@ -169,6 +169,8 @@ // Compile using multi-thread libraries. #define ACE_MT_SAFE +#define ACE_NEEDS_DEV_IO_CONVERSION + // Turns off the tracing feature. #if !defined (ACE_NTRACE) #define ACE_NTRACE 1 diff --git a/ace/config-sunos4-lucid3.2.h b/ace/config-sunos4-lucid3.2.h index 5ecf46eaf69..42109cbaf6d 100644 --- a/ace/config-sunos4-lucid3.2.h +++ b/ace/config-sunos4-lucid3.2.h @@ -77,6 +77,8 @@ // Platform has ACE_TLI. // #define ACE_HAS_TLI +#define ACE_NEEDS_DEV_IO_CONVERSION + // 10 millisecond fudge factor to account for Solaris timers... #if !defined (ACE_TIMER_SKEW) #define ACE_TIMER_SKEW 1000 * 10 diff --git a/ace/config-sunos4-sun3.x.h b/ace/config-sunos4-sun3.x.h index 84607a9520c..d38b499148d 100644 --- a/ace/config-sunos4-sun3.x.h +++ b/ace/config-sunos4-sun3.x.h @@ -71,6 +71,8 @@ #define ACE_LACKS_LINEBUFFERED_STREAMBUF #define ACE_LACKS_SIGNED_CHAR +#define ACE_NEEDS_DEV_IO_CONVERSION + // 10 millisecond fudge factor to account for Solaris timers... #if !defined (ACE_TIMER_SKEW) #define ACE_TIMER_SKEW 1000 * 10 diff --git a/ace/config-sunos4-sun4.1.4.h b/ace/config-sunos4-sun4.1.4.h index 9701883d107..f936d9bbc6e 100644 --- a/ace/config-sunos4-sun4.1.4.h +++ b/ace/config-sunos4-sun4.1.4.h @@ -79,6 +79,8 @@ #define ACE_LACKS_LINEBUFFERED_STREAMBUF #define ACE_LACKS_SIGNED_CHAR +#define ACE_NEEDS_DEV_IO_CONVERSION + // 10 millisecond fudge factor to account for Solaris timers... #if !defined (ACE_TIMER_SKEW) #define ACE_TIMER_SKEW 1000 * 10 diff --git a/ace/config-sunos4-sun4.x-orbix.h b/ace/config-sunos4-sun4.x-orbix.h index 66c3f559adc..0771d3e80ec 100644 --- a/ace/config-sunos4-sun4.x-orbix.h +++ b/ace/config-sunos4-sun4.x-orbix.h @@ -80,6 +80,8 @@ #define ACE_LACKS_LINEBUFFERED_STREAMBUF #define ACE_LACKS_SIGNED_CHAR +#define ACE_NEEDS_DEV_IO_CONVERSION + // 10 millisecond fudge factor to account for Solaris timers... #if !defined (ACE_TIMER_SKEW) #define ACE_TIMER_SKEW 1000 * 10 diff --git a/ace/config-sunos4-sun4.x.h b/ace/config-sunos4-sun4.x.h index 051ad8cdade..ee4cd2c505a 100644 --- a/ace/config-sunos4-sun4.x.h +++ b/ace/config-sunos4-sun4.x.h @@ -75,6 +75,8 @@ #define ACE_LACKS_LINEBUFFERED_STREAMBUF #define ACE_LACKS_SIGNED_CHAR +#define ACE_NEEDS_DEV_IO_CONVERSION + // 10 millisecond fudge factor to account for Solaris timers... #if !defined (ACE_TIMER_SKEW) #define ACE_TIMER_SKEW 1000 * 10 diff --git a/ace/config-sunos5.4-centerline-2.x.h b/ace/config-sunos5.4-centerline-2.x.h index 26f9b74262f..348f859cc43 100644 --- a/ace/config-sunos5.4-centerline-2.x.h +++ b/ace/config-sunos5.4-centerline-2.x.h @@ -138,6 +138,8 @@ // Platform supports ACE_TLI. #define ACE_HAS_TLI +#define ACE_NEEDS_DEV_IO_CONVERSION + // 10 millisecond fudge factor to account for Solaris timers... #if !defined (ACE_TIMER_SKEW) #define ACE_TIMER_SKEW 1000 * 10 diff --git a/ace/config-sunos5.4-sunc++-4.x-orbix.h b/ace/config-sunos5.4-sunc++-4.x-orbix.h index 35f04690586..02ebf44cf67 100644 --- a/ace/config-sunos5.4-sunc++-4.x-orbix.h +++ b/ace/config-sunos5.4-sunc++-4.x-orbix.h @@ -161,6 +161,8 @@ // Use the poll() event demultiplexor rather than select(). //#define ACE_USE_POLL +#define ACE_NEEDS_DEV_IO_CONVERSION + // 10 millisecond fudge factor to account for Solaris timers... #if !defined (ACE_TIMER_SKEW) #define ACE_TIMER_SKEW 1000 * 10 diff --git a/ace/config-sunos5.4-sunc++-4.x.h b/ace/config-sunos5.4-sunc++-4.x.h index 79584823e8a..2feac414057 100644 --- a/ace/config-sunos5.4-sunc++-4.x.h +++ b/ace/config-sunos5.4-sunc++-4.x.h @@ -157,6 +157,8 @@ // Use the poll() event demultiplexor rather than select(). //#define ACE_USE_POLL +#define ACE_NEEDS_DEV_IO_CONVERSION + // 10 millisecond fudge factor to account for Solaris timers... #if !defined (ACE_TIMER_SKEW) #define ACE_TIMER_SKEW 1000 * 10 diff --git a/ace/config-sunos5.5-sunc++-4.1.h b/ace/config-sunos5.5-sunc++-4.1.h index 86d83ae3010..f106aea14fa 100644 --- a/ace/config-sunos5.5-sunc++-4.1.h +++ b/ace/config-sunos5.5-sunc++-4.1.h @@ -4,14 +4,13 @@ // The following configuration file is designed to work for SunOS 5.5 // platforms using the SunC++ 4.1 compiler. -// NOTE: if you have link problems with undefined inline template -// functions, try building with __ACE_INLINE__ (add it to the CXX -// macro include/makeinclude/platform_macros.h). - #if !defined (ACE_CONFIG_H) #define ACE_CONFIG_H #if ! defined (__ACE_INLINE__) +// NOTE: if you have link problems with undefined inline template +// functions, be sure that the #define of __ACE_INLINE__ below is +// not commented out. #define __ACE_INLINE__ #endif /* ! __ACE_INLINE__ */ diff --git a/ace/config-sunos5.5-sunc++-4.x-orbix.h b/ace/config-sunos5.5-sunc++-4.x-orbix.h index f8de6759d80..97e6c424dd8 100644 --- a/ace/config-sunos5.5-sunc++-4.x-orbix.h +++ b/ace/config-sunos5.5-sunc++-4.x-orbix.h @@ -166,6 +166,8 @@ // Use the poll() event demultiplexor rather than select(). //#define ACE_USE_POLL +#define ACE_NEEDS_DEV_IO_CONVERSION + // 10 millisecond fudge factor to account for Solaris timers... #if !defined (ACE_TIMER_SKEW) #define ACE_TIMER_SKEW 1000 * 10 diff --git a/ace/config-sunos5.5-sunc++-4.x.h b/ace/config-sunos5.5-sunc++-4.x.h index ed6e9a30214..1ecb22246fd 100644 --- a/ace/config-sunos5.5-sunc++-4.x.h +++ b/ace/config-sunos5.5-sunc++-4.x.h @@ -161,6 +161,8 @@ // Use the poll() event demultiplexor rather than select(). //#define ACE_USE_POLL +#define ACE_NEEDS_DEV_IO_CONVERSION + // 10 millisecond fudge factor to account for Solaris timers... #if !defined (ACE_TIMER_SKEW) #define ACE_TIMER_SKEW 1000 * 10 diff --git a/ace/config-sunx86-sunc++-4.x.h b/ace/config-sunx86-sunc++-4.x.h index 78881b63c94..f7cd70746b2 100644 --- a/ace/config-sunx86-sunc++-4.x.h +++ b/ace/config-sunx86-sunc++-4.x.h @@ -128,6 +128,8 @@ // Use the poll() event demultiplexor rather than select(). //#define ACE_USE_POLL +#define ACE_NEEDS_DEV_IO_CONVERSION + // 10 millisecond fudge factor to account for Solaris timers... #if !defined (ACE_TIMER_SKEW) #define ACE_TIMER_SKEW 1000 * 10 diff --git a/ace/config-win32-msvc2.0.h b/ace/config-win32-msvc2.0.h index 3ecd33a3973..7950ad333ce 100644 --- a/ace/config-win32-msvc2.0.h +++ b/ace/config-win32-msvc2.0.h @@ -131,6 +131,7 @@ #define ACE_LACKS_SEMBUF_T #define ACE_LACKS_MSGBUF_T #define ACE_LACKS_SYSV_SHMEM +#define ACE_NEEDS_DEV_IO_CONVERSION // Platform supports POSIX O_NONBLOCK semantics. //define ACE_HAS_POSIX_NONBLOCK diff --git a/ace/config-win32-msvc4.x.h b/ace/config-win32-msvc4.x.h index 6783d705271..3882b18b3c6 100644 --- a/ace/config-win32-msvc4.x.h +++ b/ace/config-win32-msvc4.x.h @@ -132,6 +132,7 @@ #define ACE_LACKS_SEMBUF_T #define ACE_LACKS_MSGBUF_T #define ACE_LACKS_SYSV_SHMEM +#define ACE_NEEDS_DEV_IO_CONVERSION // Build as as a DLL. Zap this line if you want to build a static // lib. diff --git a/ace/config-winnt-4.0-msvc4.x.h b/ace/config-winnt-4.0-msvc4.x.h index 6e8be824cff..a2edbaa1325 100644 --- a/ace/config-winnt-4.0-msvc4.x.h +++ b/ace/config-winnt-4.0-msvc4.x.h @@ -131,6 +131,7 @@ #define ACE_LACKS_SEMBUF_T #define ACE_LACKS_MSGBUF_T #define ACE_LACKS_SYSV_SHMEM +#define ACE_NEEDS_DEV_IO_CONVERSION // Build as as a DLL. Zap this line if you want to build a static // lib. |