diff options
author | schmidt <douglascraigschmidt@users.noreply.github.com> | 1998-04-13 22:16:07 +0000 |
---|---|---|
committer | schmidt <douglascraigschmidt@users.noreply.github.com> | 1998-04-13 22:16:07 +0000 |
commit | b15122b316022d7e052092875c91ec188ec07a0c (patch) | |
tree | 501b2b81c9567c9b5163d46f3275fd733786c06c | |
parent | 8e5dee564c4b134d2bb4d1121dbd3b63afabb0ef (diff) | |
download | ATCD-b15122b316022d7e052092875c91ec188ec07a0c.tar.gz |
*** empty log message ***
-rw-r--r-- | ChangeLog-98a | 11 | ||||
-rw-r--r-- | ace/ACE.cpp | 9 | ||||
-rw-r--r-- | ace/OS.cpp | 2 | ||||
-rw-r--r-- | ace/README | 2 | ||||
-rw-r--r-- | ace/config-aix-4.2.x.h | 3 | ||||
-rw-r--r-- | ace/config-hpux-10.x.h | 3 | ||||
-rw-r--r-- | ace/config-hpux11.h | 4 | ||||
-rw-r--r-- | ace/config-irix6.x-g++.h | 3 | ||||
-rw-r--r-- | ace/config-irix6.x-sgic++-nothreads.h | 3 | ||||
-rw-r--r-- | ace/config-irix6.x-sgic++.h | 3 | ||||
-rw-r--r-- | ace/config-sunos4-g++.h | 3 | ||||
-rw-r--r-- | ace/config-sunos4-lucid3.2.h | 3 | ||||
-rw-r--r-- | ace/config-sunos4-sun3.x.h | 3 | ||||
-rw-r--r-- | ace/config-sunos4-sun4.1.4.h | 3 | ||||
-rw-r--r-- | ace/config-sunos4-sun4.x-orbix.h | 3 | ||||
-rw-r--r-- | ace/config-sunos4-sun4.x.h | 3 | ||||
-rw-r--r-- | ace/config-sunos5.4-centerline-2.x.h | 3 | ||||
-rw-r--r-- | ace/config-sunos5.4-g++.h | 3 | ||||
-rw-r--r-- | ace/config-sunos5.4-sunc++-4.x-orbix.h | 3 | ||||
-rw-r--r-- | ace/config-sunos5.4-sunc++-4.x.h | 3 | ||||
-rw-r--r-- | ace/config-sunos5.5-g++.h | 3 | ||||
-rw-r--r-- | ace/config-sunos5.5-sunc++-4.x.h | 3 | ||||
-rw-r--r-- | ace/config-sunx86-sunc++-4.x.h | 3 | ||||
-rw-r--r-- | ace/config-win32-common.h | 3 |
24 files changed, 18 insertions, 67 deletions
diff --git a/ChangeLog-98a b/ChangeLog-98a index 96d8708b039..5f01816bd41 100644 --- a/ChangeLog-98a +++ b/ChangeLog-98a @@ -1,3 +1,14 @@ +Mon Apr 13 16:56:18 1998 Douglas C. Schmidt <schmidt@tango.cs.wustl.edu> + + * ace: Removed all uses of ACE_HAS_WILDCARD_BIND. This is now the + default behavior. If there's some weird platform that DOESN'T + have this behavior, we'll deal with that by setting the + ACE_LACKS_WILDCARD_BIND flag. + + * ace/OS.cpp (invoke): Removed the (void *) cast on delete this. + It wasn't necessary. Thanks to Steve Huston and David Levine + for reporting this. + Mon Apr 13 10:18:59 1998 David L. Levine <levine@cs.wustl.edu> * ace/High_Res_Timer.i (hrtime_to_tv): in tv.usec calculation, diff --git a/ace/ACE.cpp b/ace/ACE.cpp index 5bc9dd8d171..768d1af65e5 100644 --- a/ace/ACE.cpp +++ b/ace/ACE.cpp @@ -1551,9 +1551,6 @@ ACE::bind_port (ACE_HANDLE handle, ACE_TRACE ("ACE::bind_port"); sockaddr_in sin; - static u_short upper_limit = ACE_MAX_DEFAULT_PORT; - int lower_limit = IPPORT_RESERVED; - int round_trip = upper_limit; ACE_OS::memset ((void *) &sin, 0, sizeof sin); sin.sin_family = AF_INET; @@ -1562,11 +1559,15 @@ ACE::bind_port (ACE_HANDLE handle, #endif /* ACE_HAS_SIN_LEN */ sin.sin_addr.s_addr = ip_addr; -#if defined (ACE_HAS_WILDCARD_BIND) +#if !defined (ACE_LACKS_WILDCARD_BIND) // The OS kernel should select a free port for us. sin.sin_port = 0; return ACE_OS::bind (handle, (sockaddr *) &sin, sizeof sin); #else + static u_short upper_limit = ACE_MAX_DEFAULT_PORT; + int round_trip = upper_limit; + int lower_limit = IPPORT_RESERVED; + // We have to select the port explicitly. for (;;) diff --git a/ace/OS.cpp b/ace/OS.cpp index 35176d87e32..9dc07ccc4e4 100644 --- a/ace/OS.cpp +++ b/ace/OS.cpp @@ -1714,7 +1714,7 @@ ACE_Thread_Adapter::invoke (void) void *arg = this->arg_; // Delete ourselves since we don't need <this> anymore. - delete (void *) this; + delete this; void *status = 0; diff --git a/ace/README b/ace/README index 93934337491..e940e7fbd21 100644 --- a/ace/README +++ b/ace/README @@ -211,7 +211,6 @@ ACE_HAS_USING_KEYWORD Compiler supports the new using keyword for C++ namespac ACE_HAS_VERBOSE_NOTSUP Prints out console message in ACE_NOTSUP. Useful for tracking down origin of ACE_NOTSUP. ACE_HAS_VOIDPTR_MMAP Platform requires void * for mmap(). ACE_HAS_VOIDPTR_SOCKOPT OS/compiler uses void * arg 4 setsockopt() rather than const char * -ACE_HAS_WILDCARD_BIND The bind() call will select the port if it's 0. ACE_HAS_WIN32_TRYLOCK The Win32 platform support TryEnterCriticalSection() (WinNT 4.0 and beyond) ACE_HAS_WINSOCK2 The Win32 platform supports WinSock 2.0 ACE_HAS_XLI Platform has the XLI version of TLI @@ -295,6 +294,7 @@ ACE_LACKS_UNISTD_H Platform lacks the unistd.h file (e.g., ACE_LACKS_UNIX_DOMAIN_SOCKETS ACE platform has no UNIX domain sockets ACE_LACKS_UNIX_SIGNALS Platform lacks full signal support (e.g., Win32 and Chorus). ACE_LACKS_UTSNAME_T Platform lacks struct utsname (e.g., Win32 and VxWorks) +ACE_LACKS_WILDCARD_BIND The bind() call will not select the port if it's 0. ACE_MAIN Renames "main (int, char *[])", for platforms such as g++/VxWorks that don't allow main. Requires the use of ACE_HAS_NONSTATIC_OBJECT_MANAGER. ACE_MT_SAFE Compile using multi-thread libraries ACE_NDEBUG Turns off debugging features diff --git a/ace/config-aix-4.2.x.h b/ace/config-aix-4.2.x.h index 96ec8073678..a4af061b208 100644 --- a/ace/config-aix-4.2.x.h +++ b/ace/config-aix-4.2.x.h @@ -116,9 +116,6 @@ #define ACE_HAS_UCONTEXT_T #define ACE_HAS_SIZET_SOCKET_LEN -// Platform selects a port automatically if asked to bind to port 0 -#define ACE_HAS_WILDCARD_BIND - // Platform has XPG4 wide character type and functions #define ACE_HAS_XPG4_MULTIBYTE_CHAR diff --git a/ace/config-hpux-10.x.h b/ace/config-hpux-10.x.h index 6473280b1ca..fcbe4a22275 100644 --- a/ace/config-hpux-10.x.h +++ b/ace/config-hpux-10.x.h @@ -123,9 +123,6 @@ extern int h_errno; /* This isn't declared in a header file on HP-UX */ // Platform supports the tid_t type #define ACE_HAS_TID_T -// Platform selects a port automatically if asked to bind to port 0 -#define ACE_HAS_WILDCARD_BIND - // Platform has XPG4 wide character support #define ACE_HAS_XPG4_MULTIBYTE_CHAR diff --git a/ace/config-hpux11.h b/ace/config-hpux11.h index c6df8d2f05a..d9996a3ccb1 100644 --- a/ace/config-hpux11.h +++ b/ace/config-hpux11.h @@ -22,7 +22,6 @@ #include /**/ <sys/stdsyms.h> - //////////////////////////////////////////////////////////////////////////// // // General OS information - see README for more details on what they mean @@ -114,9 +113,6 @@ // Platform supports the tid_t type #define ACE_HAS_TID_T -// Platform selects a port automatically if asked to bind to port 0 -#define ACE_HAS_WILDCARD_BIND - // Platform has XPG4 wide character support #define ACE_HAS_XPG4_MULTIBYTE_CHAR diff --git a/ace/config-irix6.x-g++.h b/ace/config-irix6.x-g++.h index d8da99c6450..b52175681d6 100644 --- a/ace/config-irix6.x-g++.h +++ b/ace/config-irix6.x-g++.h @@ -158,7 +158,4 @@ #define ACE_NTRACE 1 #endif /* ACE_NTRACE */ -// The OS bind() call will select the port if it's 0. -#define ACE_HAS_WILDCARD_BIND - #endif /* ACE_CONFIG_H */ diff --git a/ace/config-irix6.x-sgic++-nothreads.h b/ace/config-irix6.x-sgic++-nothreads.h index 233ca5e7970..7db41bf041c 100644 --- a/ace/config-irix6.x-sgic++-nothreads.h +++ b/ace/config-irix6.x-sgic++-nothreads.h @@ -207,7 +207,4 @@ #define ACE_NTRACE 1 #endif /* ACE_NTRACE */ -// The OS bind() call will select the port if it's 0. -#define ACE_HAS_WILDCARD_BIND - #endif /* ACE_CONFIG_IRIX6X_NTHR_H */ diff --git a/ace/config-irix6.x-sgic++.h b/ace/config-irix6.x-sgic++.h index e78e0116693..687d48fbf6f 100644 --- a/ace/config-irix6.x-sgic++.h +++ b/ace/config-irix6.x-sgic++.h @@ -49,7 +49,4 @@ #define ACE_MT_SAFE 1 #endif /* ACE_MT_SAFE */ -// The OS bind() call will select the port if it's 0. -#define ACE_HAS_WILDCARD_BIND - #endif /* ACE_CONFIG_IRIX6X_H */ diff --git a/ace/config-sunos4-g++.h b/ace/config-sunos4-g++.h index a8f584ca1dd..35ee50eb8c9 100644 --- a/ace/config-sunos4-g++.h +++ b/ace/config-sunos4-g++.h @@ -100,7 +100,4 @@ #define ACE_NTRACE 1 #endif /* ACE_NTRACE */ -// The OS bind() call will select the port if it's 0. -#define ACE_HAS_WILDCARD_BIND - #endif /* ACE_CONFIG_H */ diff --git a/ace/config-sunos4-lucid3.2.h b/ace/config-sunos4-lucid3.2.h index ddc3b48e99c..8b3298ce913 100644 --- a/ace/config-sunos4-lucid3.2.h +++ b/ace/config-sunos4-lucid3.2.h @@ -95,7 +95,4 @@ #define ACE_NTRACE 1 #endif /* ACE_NTRACE */ -// The OS bind() call will select the port if it's 0. -#define ACE_HAS_WILDCARD_BIND - #endif /* ACE_CONFIG_H */ diff --git a/ace/config-sunos4-sun3.x.h b/ace/config-sunos4-sun3.x.h index c7663580b8c..911fb9d59ac 100644 --- a/ace/config-sunos4-sun3.x.h +++ b/ace/config-sunos4-sun3.x.h @@ -90,7 +90,4 @@ #define ACE_NTRACE 1 #endif /* ACE_NTRACE */ -// The OS bind() call will select the port if it's 0. -#define ACE_HAS_WILDCARD_BIND - #endif /* ACE_CONFIG_H */ diff --git a/ace/config-sunos4-sun4.1.4.h b/ace/config-sunos4-sun4.1.4.h index 751b0650b10..1ea5ba21a97 100644 --- a/ace/config-sunos4-sun4.1.4.h +++ b/ace/config-sunos4-sun4.1.4.h @@ -97,7 +97,4 @@ #define ACE_NTRACE 1 #endif /* ACE_NTRACE */ -// The OS bind() call will select the port if it's 0. -#define ACE_HAS_WILDCARD_BIND - #endif /* ACE_CONFIG_H */ diff --git a/ace/config-sunos4-sun4.x-orbix.h b/ace/config-sunos4-sun4.x-orbix.h index 0d858623611..41f60b10ed0 100644 --- a/ace/config-sunos4-sun4.x-orbix.h +++ b/ace/config-sunos4-sun4.x-orbix.h @@ -98,7 +98,4 @@ #define ACE_NTRACE 1 #endif /* ACE_NTRACE */ -// The OS bind() call will select the port if it's 0. -#define ACE_HAS_WILDCARD_BIND - #endif /* ACE_CONFIG_H */ diff --git a/ace/config-sunos4-sun4.x.h b/ace/config-sunos4-sun4.x.h index 45c97f20113..00659f4b743 100644 --- a/ace/config-sunos4-sun4.x.h +++ b/ace/config-sunos4-sun4.x.h @@ -95,7 +95,4 @@ #define ACE_NTRACE 1 #endif /* ACE_NTRACE */ -// The OS bind() call will select the port if it's 0. -#define ACE_HAS_WILDCARD_BIND - #endif /* ACE_CONFIG_H */ diff --git a/ace/config-sunos5.4-centerline-2.x.h b/ace/config-sunos5.4-centerline-2.x.h index a8e6ba98375..9af1adca45c 100644 --- a/ace/config-sunos5.4-centerline-2.x.h +++ b/ace/config-sunos5.4-centerline-2.x.h @@ -168,7 +168,4 @@ // Defines the page size of the system. #define ACE_PAGE_SIZE 4096 -// The OS bind() call will select the port if it's 0. -#define ACE_HAS_WILDCARD_BIND - #endif /* ACE_CONFIG_H */ diff --git a/ace/config-sunos5.4-g++.h b/ace/config-sunos5.4-g++.h index 26a5bca87ff..3cd11f036cf 100644 --- a/ace/config-sunos5.4-g++.h +++ b/ace/config-sunos5.4-g++.h @@ -178,7 +178,4 @@ // Defines the page size of the system. #define ACE_PAGE_SIZE 4096 -// The OS bind() call will select the port if it's 0. -#define ACE_HAS_WILDCARD_BIND - #endif /* ACE_CONFIG_H */ diff --git a/ace/config-sunos5.4-sunc++-4.x-orbix.h b/ace/config-sunos5.4-sunc++-4.x-orbix.h index 691ca18aaef..d356414a905 100644 --- a/ace/config-sunos5.4-sunc++-4.x-orbix.h +++ b/ace/config-sunos5.4-sunc++-4.x-orbix.h @@ -187,7 +187,4 @@ // Defines the page size of the system. #define ACE_PAGE_SIZE 4096 -// The OS bind() call will select the port if it's 0. -#define ACE_HAS_WILDCARD_BIND - #endif /* ACE_CONFIG_H */ diff --git a/ace/config-sunos5.4-sunc++-4.x.h b/ace/config-sunos5.4-sunc++-4.x.h index 2e8f2c37e88..3a1b4eb8d34 100644 --- a/ace/config-sunos5.4-sunc++-4.x.h +++ b/ace/config-sunos5.4-sunc++-4.x.h @@ -185,7 +185,4 @@ // Defines the page size of the system. #define ACE_PAGE_SIZE 4096 -// The OS bind() call will select the port if it's 0. -#define ACE_HAS_WILDCARD_BIND - #endif /* ACE_CONFIG_H */ diff --git a/ace/config-sunos5.5-g++.h b/ace/config-sunos5.5-g++.h index 37aed0ecb05..d0bfc34feda 100644 --- a/ace/config-sunos5.5-g++.h +++ b/ace/config-sunos5.5-g++.h @@ -201,7 +201,4 @@ #define ACE_HAS_STL_MAP_CONFLICT #define ACE_HAS_STL_QUEUE_CONFLICT -// The OS bind() call will select the port if it's 0. -#define ACE_HAS_WILDCARD_BIND - #endif /* ACE_CONFIG_H */ diff --git a/ace/config-sunos5.5-sunc++-4.x.h b/ace/config-sunos5.5-sunc++-4.x.h index 850f54dd53a..1186f01ba40 100644 --- a/ace/config-sunos5.5-sunc++-4.x.h +++ b/ace/config-sunos5.5-sunc++-4.x.h @@ -227,7 +227,4 @@ #define ACE_HAS_STL_MAP_CONFLICT #define ACE_HAS_STL_QUEUE_CONFLICT -// The OS bind() call will select the port if it's 0. -#define ACE_HAS_WILDCARD_BIND - #endif /* ACE_CONFIG_H */ diff --git a/ace/config-sunx86-sunc++-4.x.h b/ace/config-sunx86-sunc++-4.x.h index 59930db605b..e7a10386393 100644 --- a/ace/config-sunx86-sunc++-4.x.h +++ b/ace/config-sunx86-sunc++-4.x.h @@ -7,9 +7,6 @@ #if !defined (ACE_CONFIG_H) #define ACE_CONFIG_H -// The OS bind() call will select the port if it's 0. -#define ACE_HAS_WILDCARD_BIND - // Optimize ACE_Handle_Set for select(). #define ACE_HAS_HANDLE_SET_OPTIMIZED_FOR_SELECT diff --git a/ace/config-win32-common.h b/ace/config-win32-common.h index 48eed18cae2..fa15deb0c33 100644 --- a/ace/config-win32-common.h +++ b/ace/config-win32-common.h @@ -32,9 +32,6 @@ #define ACE_LACKS_UNISTD_H #define ACE_LACKS_RLIMIT -// The OS bind() call will select the port if it's 0. -#define ACE_HAS_WILDCARD_BIND - #define ACE_SIZEOF_LONG_LONG 8 typedef unsigned __int64 ACE_UINT64; |