Merged revisions 76116-76141 via svnmerge from

https://svn.dre.vanderbilt.edu/DOC/Middleware/trunk

........
  r76117 | olli | 2006-12-20 16:13:10 -0600 (Wed, 20 Dec 2006) | 1 line
  
  ChangeLogTag: Wed Dec 20 22:06:14 UTC 2006  Olli Savia  <ops@iki.fi>
........
  r76118 | johnnyw | 2006-12-21 02:47:46 -0600 (Thu, 21 Dec 2006) | 1 line
  
  Thu Dec 21 08:47:04 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
........
  r76119 | sma | 2006-12-21 03:45:38 -0600 (Thu, 21 Dec 2006) | 1 line
  
  ChangeLogTag: Thu Dec 21 09:45:00 UTC 2006  Simon Massey  <sma@prismtech.com>
........
  r76120 | johnnyw | 2006-12-21 04:18:28 -0600 (Thu, 21 Dec 2006) | 1 line
  
  Thu Dec 21 10:17:04 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
........
  r76121 | johnnyw | 2006-12-21 06:11:59 -0600 (Thu, 21 Dec 2006) | 1 line
  
  Thu Dec 21 12:11:04 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
........
  r76122 | johnnyw | 2006-12-21 06:12:34 -0600 (Thu, 21 Dec 2006) | 1 line
  
  Thu Dec 21 12:12:04 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
........
  r76123 | olli | 2006-12-21 07:35:11 -0600 (Thu, 21 Dec 2006) | 1 line
  
  ChangeLogTag: Thu Dec 21 13:32:08 UTC 2006  Olli Savia  <ops@iki.fi>
........
  r76124 | johnnyw | 2006-12-21 07:49:14 -0600 (Thu, 21 Dec 2006) | 1 line
........
  r76125 | johnnyw | 2006-12-21 07:51:42 -0600 (Thu, 21 Dec 2006) | 1 line
  
  Thu Dec 21 12:12:04 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
........
  r76126 | jtc | 2006-12-21 08:06:05 -0600 (Thu, 21 Dec 2006) | 1 line
  
  ChangeLogTag: Thu Dec 21 14:00:11 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
........
  r76127 | johnnyw | 2006-12-21 08:33:11 -0600 (Thu, 21 Dec 2006) | 1 line
  
  Thu Dec 21 14:31:04 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
........
  r76128 | jtc | 2006-12-21 08:53:39 -0600 (Thu, 21 Dec 2006) | 1 line
  
  ChangeLogTag: Thu Dec 21 14:46:46 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
........
  r76129 | iliyan | 2006-12-21 09:36:20 -0600 (Thu, 21 Dec 2006) | 1 line
  
  ChangeLogTag: Thu Dec 21 15:32:49 UTC 2006  Iliyan Jeliazkov  <iliyan@ociweb.com>
........
  r76130 | iliyan | 2006-12-21 10:06:42 -0600 (Thu, 21 Dec 2006) | 1 line
  
  ChangeLogTag: Thu Dec 21 16:03:08 UTC 2006  Iliyan Jeliazkov  <iliyan@ociweb.com>
........
  r76131 | iliyan | 2006-12-21 10:14:18 -0600 (Thu, 21 Dec 2006) | 1 line
  
  ChangeLogTag: Thu Dec 21 16:12:16 UTC 2006  Iliyan Jeliazkov  <iliyan@ociweb.com>
........
  r76132 | iliyan | 2006-12-21 11:52:20 -0600 (Thu, 21 Dec 2006) | 1 line
  
  ChangeLogTag: Thu Dec 21 17:49:24 UTC 2006  Iliyan Jeliazkov  <iliyan@ociweb.com>
........
  r76133 | johnnyw | 2006-12-21 14:20:29 -0600 (Thu, 21 Dec 2006) | 1 line
  
  Thu Dec 21 20:19:04 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
........
  r76134 | iliyan | 2006-12-21 15:30:59 -0600 (Thu, 21 Dec 2006) | 1 line
  
  ChangeLogTag: Thu Dec 21 21:29:47 UTC 2006  Iliyan Jeliazkov  <iliyan@ociweb.com>
........
  r76135 | schmidt | 2006-12-21 15:56:38 -0600 (Thu, 21 Dec 2006) | 1 line
  
  ChangeLogTag:Thu
........
  r76136 | johnnyw | 2006-12-22 03:32:21 -0600 (Fri, 22 Dec 2006) | 1 line
  
  Fri Dec 22 09:31:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
........
  r76137 | johnnyw | 2006-12-22 04:02:18 -0600 (Fri, 22 Dec 2006) | 1 line
........
  r76138 | olli | 2006-12-22 06:53:04 -0600 (Fri, 22 Dec 2006) | 1 line
  
  ChangeLogTag: Fri Dec 22 12:52:05 UTC 2006  Olli Savia  <ops@iki.fi>
........
  r76139 | shuston | 2006-12-22 07:58:25 -0600 (Fri, 22 Dec 2006) | 1 line
  
  ChangeLogTag:Fri Dec 22 13:56:15 UTC 2006  Steve Huston  <shuston@riverace.com>
........
  r76140 | jtc | 2006-12-22 11:45:45 -0600 (Fri, 22 Dec 2006) | 1 line
  
  ChangeLogTag: Fri Dec 22 17:35:53 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
........

39 files changed, 382 insertions, 229 deletions

diff --git a/ACE/ChangeLog b/ACE/ChangeLog
index 60b78a12b6f..dc36afa5ac7 100644
--- a/ACE/ChangeLog
+++ b/ACE/ChangeLog
@@ -1,3 +1,92 @@
+Fri Dec 22 17:35:53 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
+
+        * ace/OS_NS_dirent.inl:
+
+          Add a __NetBSD__ to the preprocessor conditional to select the
+          three argument version of readdir_r.  While this what was done
+          for FreeBSD, HPUX, etc., it really points out a need for a new
+          feature test macro.
+
+        * ace/config-netbsd.h:
+
+          Only define thread-related feature test macros if ACE_MT_SAFE is
+          defined (with a non-zero value).
+
+Fri Dec 22 13:56:15 UTC 2006  Steve Huston  <shuston@riverace.com>
+
+        * apps/JAWS2/HTTPU/http_heders.cpp:
+        * apps/JAWS2/HTTPU/http_status.cpp: Specify type and class separately
+          for each static member instance to allow HP aC++ 03.* (PA-RISC
+          compiler) to grok it. At least the Itanium compilers could handle
+          this... there's hope.
+
+Fri Dec 22 12:52:05 UTC 2006  Olli Savia  <ops@iki.fi>
+
+        * include/makeinclude/platform_lynxos.GNU:
+          Build shared libs by default.
+
+Fri Dec 22 09:31:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ace/Service_Manager.h:
+          Improved doxygen documentation, thanks to Stefan Naewe
+          <stefan at naewe dot de> for delivering the patch
+
+Thu Dec 21 21:54:51 UTC 2006  Douglas C. Schmidt  <schmidt@dre.vanderbilt.edu>
+
+        * ace/config-freebsd.h: Added support for SCTP in FreeBSD version
+          700028 and greater.  Thanks to Craig Rodrigues <rodrigc at
+          crodrigues dot org> for reporting this.
+
+Thu Dec 21 20:19:04 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ace/Sock_Connect.cpp:
+          Use prefix increment and made get_interfaces working with rtems
+
+Thu Dec 21 16:12:16 UTC 2006  Iliyan Jeliazkov  <iliyan@ociweb.com>
+
+        * bin/tao_orb_tests.lst:
+
+          Fixing the condition for running the Transport::Current tests
+          (note that ST = Single Threaded, not STATIC).
+
+Thu Dec 21 14:31:04 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ace/Sock_Connect.cpp:
+          Added support for get_interfaces for rtems
+
+Thu Dec 21 13:32:08 UTC 2006  Olli Savia  <ops@iki.fi>
+
+        * include/makeinclude/platform_lynxos.GNU:
+          Moved macro definitions from CFLAGS to CPPFLAGS.
+
+Thu Dec 21 12:12:04 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * include/makeinclude/rules.bin.GNU:
+          Removed old chorus rules
+
+Thu Dec 21 10:17:04 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ace/UUID.cpp:
+          Fixed initialisation warning
+
+Thu Dec 21 09:45:00 UTC 2006  Simon Massey  <sma@prismtech.com>
+
+        * ace/OS_TLI.inl:
+        * ace/OS_NS_signal.h:
+
+          Updated some HPUX Acc version bug fixes.....
+
+Thu Dec 21 08:47:04 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * apps/JAWS2/HPPTU/http_headers.{h,inl}:
+          Fixed const warnings with Intel C++
+
+Wed Dec 20 22:06:14 UTC 2006  Olli Savia  <ops@iki.fi>
+
+        * tests/OS_Test.cpp:
+          HP-UX has broken vsnprintf function. Changed the test not
+          to fail on HP-UX.
+
 Wed Dec 20 16:35:53 UTC 2006  Iliyan Jeliazkov  <iliyan@ociweb.com>
 
           These are fixes correcting scoreboard issues pertaining to the
diff --git a/ACE/THANKS b/ACE/THANKS
index 85bef6f2bf1..12ee435bc0a 100644
--- a/ACE/THANKS
+++ b/ACE/THANKS
@@ -2131,7 +2131,7 @@ Michael Reed <mnr102 at yahoo dot com>
 Heesuk Shin <heesuks at econz dot com>
 Hong Xing <hongxing777 at gmail dot com>
 Winston Zhang <winston_ace at kubao-inc dot com>
-Stefan Naewe <naewe dot s at atlas dot de>
+Stefan Naewe <naewe dot s at atlas dot de> <stefan at naewe dot de>
 Graeme Bell <graemeb at econz dot com>
 Eric Danielou <eric dot danielou at eads dot com>
 Wei Jiang <sdjiangwei at sina dot com>
diff --git a/ACE/ace/OS_NS_dirent.inl b/ACE/ace/OS_NS_dirent.inl
index abb52ab2b11..73f0f8dce82 100644
--- a/ACE/ace/OS_NS_dirent.inl
+++ b/ACE/ace/OS_NS_dirent.inl
@@ -86,6 +86,7 @@ readdir_r (ACE_DIR *dirp,
                          defined (ACE_HAS_PTHREADS_DRAFT7) || \
                          defined (_POSIX_SOURCE) || \
                          defined (__FreeBSD__) || \
+			 defined (__NetBSD__) || \
                          defined (HPUX_11)) || \
                          defined (__GNUC__) && defined (_AIX) || \
                          defined (ACE_VXWORKS))
diff --git a/ACE/ace/OS_NS_signal.h b/ACE/ace/OS_NS_signal.h
index ec59a0e91a1..bb5b03b1c0d 100644
--- a/ACE/ace/OS_NS_signal.h
+++ b/ACE/ace/OS_NS_signal.h
@@ -81,7 +81,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 // Also see ChangeLog entries:
 // Mon Jan 23 16:35:40 UTC 2006  Steve Huston  <shuston@riverace.com>
 // Mon Jan 23 22:08:56 UTC 2006  Steve Huston  <shuston@riverace.com>
-#if defined (__HP_aCC) && (__HP_aCC <= 36500)
+#if defined (__HP_aCC) && (__HP_aCC <= 37300)
 typedef extern "C" struct sigaction  ACE_SIGACTION;
 #else
 typedef struct sigaction ACE_SIGACTION;
diff --git a/ACE/ace/OS_TLI.h b/ACE/ace/OS_TLI.h
index 4744c2b8536..cc686df968b 100644
--- a/ACE/ace/OS_TLI.h
+++ b/ACE/ace/OS_TLI.h
@@ -160,7 +160,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 // Also see ChangeLog entries:
 // Mon Jan 23 16:35:40 UTC 2006  Steve Huston  <shuston@riverace.com>
 // Mon Jan 23 22:08:56 UTC 2006  Steve Huston  <shuston@riverace.com>
-#if defined (__HP_aCC) && (__HP_aCC <= 36500)
+#if defined (__HP_aCC) && (__HP_aCC <= 37300)
 typedef extern "C" struct t_optmgmt  ACE_TOPTMGMT;
 typedef extern "C" struct t_bind  ACE_TBIND;
 #else
diff --git a/ACE/ace/Rtems_init.c b/ACE/ace/Rtems_init.c
index 12a485967cb..8e5f7661f0a 100644
--- a/ACE/ace/Rtems_init.c
+++ b/ACE/ace/Rtems_init.c
@@ -4,9 +4,9 @@
 
 #if defined (ACE_HAS_RTEMS)
 
-#include <bsp.h>
-
-char *rtems_progname;
+#define RTEMS_BSP_NETWORK_DRIVER_NAME "ne1"
+#define RTEMS_BSP_NETWORK_DRIVER_ATTACH rtems_ne_driver_attach
+#define CONFIGURE_LIBIO_MAXIMUM_FILE_DESCRIPTORS 256
 
 #define CONFIGURE_MAXIMUM_POSIX_THREADS 50
 #define CONFIGURE_MAXIMUM_POSIX_MUTEXES 300
@@ -33,6 +33,10 @@ char *rtems_progname;
                                            RTEMS_NO_ASR | \
                                            RTEMS_INTERRUPT_LEVEL(0))
 
+#include <bsp.h>
+
+char *rtems_progname;
+
 #define CONFIGURE_INIT
 rtems_task Init (rtems_task_argument argument);
 
@@ -43,7 +47,6 @@ rtems_task Init (rtems_task_argument argument);
 #if !defined (ACE_LACKS_NETWORKING)
 
 #include <rtems/rtems_bsdnet.h>
-/* start of #include "../networkconfig.h" */
 
 /*
  * Network configuration
@@ -52,8 +55,6 @@ rtems_task Init (rtems_task_argument argument);
  * EDIT THIS FILE TO REFLECT YOUR NETWORK CONFIGURATION     *
  * BEFORE RUNNING ANY RTEMS PROGRAMS WHICH USE THE NETWORK! *
  ************************************************************
- *
- *  $Id$
  */
 
 #ifndef _RTEMS_NETWORKCONFIG_H_
@@ -126,7 +127,7 @@ static struct rtems_bsdnet_ifconfig netdriver_config = {
 	NULL,				/* BOOTP supplies IP address */
 	NULL,				/* BOOTP supplies IP net mask */
 #else
-	"XXX.YYY.ZZZ.XYZ",		/* IP address */
+  "128.233.17.179",   /* IP address */
 	"255.255.255.0",		/* IP net mask */
 #endif /* !RTEMS_USE_BOOTP */
 
@@ -158,9 +159,9 @@ struct rtems_bsdnet_config rtems_bsdnet_config = {
 #if (!defined (RTEMS_USE_BOOTP))
 	"rtems_host",		/* Host name */
 	"nodomain.com",		/* Domain name */
-	"XXX.YYY.ZZZ.1",	/* Gateway */
+  "10.5.0.2", /* Gateway */
 	"XXX.YYY.ZZZ.1",	/* Log host */
-	{"XXX.YYY.ZZZ.1" },	/* Name server(s) */
+  {"10.5.0.1" },  /* Name server(s) */
 	{"XXX.YYY.ZZZ.1" },	/* NTP server(s) */
 
 	/*
diff --git a/ACE/ace/Service_Manager.h b/ACE/ace/Service_Manager.h
index 02d955a7a30..c0d0c7e0fa7 100644
--- a/ACE/ace/Service_Manager.h
+++ b/ACE/ace/Service_Manager.h
@@ -34,11 +34,11 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL
  *
  * This implementation is simple and just handles each client
  * request one at a time.  There are currently 3 types of requests:
- * + List services: If the string "help" is sent, return a list of all
+ * - List services: If the string "help" is sent, return a list of all
  *   the services supported by the Service Configurator.
- * + Reconfigure: If the string "reconfigure" is sent trigger a
+ * - Reconfigure: If the string "reconfigure" is sent trigger a
  *   reconfiguration, which will re-read the local <svc.conf> file.
- * + Process directive: If neither "help" nor "reconfigure" is sent,
+ * - Process directive: If neither "help" nor "reconfigure" is sent,
  *   simply treat the incoming string as a process directive and pass
  *   it along to <ACE_Service_Config::process_directive>.  This allows
  *   remote configuration via command-line instructions like
diff --git a/ACE/ace/Sock_Connect.cpp b/ACE/ace/Sock_Connect.cpp
index 7e134292d2d..c0ceecbf8c6 100644
--- a/ACE/ace/Sock_Connect.cpp
+++ b/ACE/ace/Sock_Connect.cpp
@@ -1012,7 +1012,7 @@ get_ip_interfaces_win32 (size_t &count,
           addrs[j].set (0,
                         devp->nwIPAddress,
                         0); // Already in net order.
-          j++;
+          ++j;
         }
       // There's no call to close the DEVHANDLE.
     }
@@ -1491,7 +1491,7 @@ get_ip_interfaces_aix (size_t &count,
         || req->ifr_addr.sa_family == AF_INET6
 # endif
         )
-       num_ifs++;
+       ++num_ifs;
     }
   ACE_NEW_RETURN (addrs,ACE_INET_Addr[num_ifs], -1);
 
@@ -1599,7 +1599,7 @@ ACE::get_ip_interfaces (size_t &count,
 #elif defined (ACE_VXWORKS) && (ACE_VXWORKS < 0x600)
   return get_ip_interfaces_vxworks_lt600 (count, addrs);
 
-#elif (defined (__unix) || defined (__unix__) || defined (__Lynx__) || defined (ACE_OPENVMS)) && !defined (ACE_LACKS_NETWORKING)
+#elif (defined (__unix) || defined (__unix__) || defined (__Lynx__) || defined (ACE_OPENVMS) || defined (ACE_HAS_RTEMS)) && !defined (ACE_LACKS_NETWORKING)
   // COMMON (SVR4 and BSD) UNIX CODE
 
   size_t num_ifs, num_ifs_found;
@@ -1702,13 +1702,13 @@ ACE::get_ip_interfaces (size_t &count,
 #  endif
               )
             {
-	      int addrlen = static_cast<int> (sizeof (struct sockaddr_in));
+              int addrlen = static_cast<int> (sizeof (struct sockaddr_in));
 #  if defined (ACE_HAS_IPV6)
               if (addr->sin_family == AF_INET6)
                 addrlen = static_cast<int> (sizeof (struct sockaddr_in6));
 #  endif
               addrs[count].set (addr, addrlen);
-              count++;
+              ++count;
             }
 # else /* ! _UNICOS */
           // need to explicitly copy on the Cray, since the bitfields kinda
@@ -1729,7 +1729,7 @@ ACE::get_ip_interfaces (size_t &count,
 # endif /* ! _UNICOS */
         }
 
-#if !defined (__QNX__) && !defined (__FreeBSD__) && !defined(__NetBSD__)
+#if !defined (__QNX__) && !defined (__FreeBSD__) && !defined(__NetBSD__) && !defined (ACE_HAS_RTEMS)
       ++pcur;
 #else
       if (pcur->ifr_addr.sa_len <= sizeof (struct sockaddr))
@@ -1835,7 +1835,7 @@ ACE::count_interfaces (ACE_HANDLE handle,
 # endif /* SIOCGLIFNUM */
 return 0;
 
-#elif (defined (__unix) || defined (__unix__) || defined (__Lynx__) || defined (ACE_OPENVMS)) && !defined (ACE_LACKS_NETWORKING)
+#elif (defined (__unix) || defined (__unix__) || defined (__Lynx__) || defined (ACE_OPENVMS) || defined (ACE_HAS_RTEMS)) && !defined (ACE_LACKS_NETWORKING)
   // Note: DEC CXX doesn't define "unix".  BSD compatible OS: HP UX,
   // AIX, SunOS 4.x perform some ioctls to retrieve ifconf list of
   // ifreq structs no SIOCGIFNUM on SunOS 4.x, so use guess and scan
@@ -1889,13 +1889,13 @@ return 0;
       if (ifcfg.ifc_len < 0)
         break;
 
-      if_count++;
-#if !defined (__QNX__) && !defined (__FreeBSD__) && !defined(__NetBSD__)
-      p_ifs++;
+      ++if_count;
+#if !defined (__QNX__) && !defined (__FreeBSD__) && !defined(__NetBSD__) && !defined (ACE_HAS_RTEMS)
+      ++p_ifs;
 #else
      if (p_ifs->ifr_addr.sa_len <= sizeof (struct sockaddr))
        {
-          p_ifs++;
+          ++p_ifs;
        }
        else
        {
@@ -1908,14 +1908,14 @@ return 0;
   ACE_OS::free (ifcfg.ifc_req);
 
 # if defined (ACE_HAS_IPV6)
-  FILE* fp;
+  FILE* fp = 0;
 
   if ((fp = ACE_OS::fopen (ACE_LIB_TEXT ("/proc/net/if_inet6"), ACE_LIB_TEXT ("r"))) != NULL)
     {
       // Scan the lines according to the expected format but don't really read any input
       while (fscanf (fp, "%*32s %*02x %*02x %*02x %*02x %*8s\n") != EOF)
         {
-          if_count++;
+          ++if_count;
         }
       ACE_OS::fclose (fp);
     }
@@ -1939,7 +1939,7 @@ ACE::get_handle (void)
   ACE_HANDLE handle = ACE_INVALID_HANDLE;
 #if defined (sparc)
   handle = ACE_OS::open ("/dev/udp", O_RDONLY);
-#elif defined (__unix) || defined (__unix__) || defined (__Lynx__) || defined (_AIX) || defined (__hpux) || (defined (ACE_VXWORKS) && (ACE_VXWORKS >= 0x600)) || defined (ACE_OPENVMS)
+#elif defined (__unix) || defined (__unix__) || defined (__Lynx__) || defined (_AIX) || defined (__hpux) || (defined (ACE_VXWORKS) && (ACE_VXWORKS >= 0x600)) || defined (ACE_OPENVMS) || defined (ACE_HAS_RTEMS)
   // Note: DEC CXX doesn't define "unix" BSD compatible OS: HP UX,
   // AIX, SunOS 4.x
 
diff --git a/ACE/ace/UUID.cpp b/ACE/ace/UUID.cpp
index ee9438fc9ab..9b35fe76a52 100644
--- a/ACE/ace/UUID.cpp
+++ b/ACE/ace/UUID.cpp
@@ -113,7 +113,7 @@ namespace ACE_Utils
         // Get a buffer exactly the correct size. Use the nil UUID as a
         // gauge.  Don't forget the trailing nul.
         size_t UUID_STRING_LENGTH = 36 + thr_id_.length () + pid_.length ();
-        char *buf;
+        char *buf = 0;
 
         if ((thr_id_.length () != 0) && (pid_.length () != 0))
           {
diff --git a/ACE/ace/config-freebsd.h b/ACE/ace/config-freebsd.h
index 0330aca36ed..15fb1f0c7b9 100644
--- a/ACE/ace/config-freebsd.h
+++ b/ACE/ace/config-freebsd.h
@@ -267,6 +267,11 @@ typedef union sigval sigval_t;
 # define ACE_HAS_SIGVAL_SIGVAL_INT
 #endif
 
+#if (__FreeBSD_version >= 700028)
+# define ACE_HAS_SCTP
+# define ACE_HAS_LKSCTP
+#endif
+
 #include /**/ "ace/post.h"
 
 #endif /* ACE_CONFIG_H */
diff --git a/ACE/ace/config-netbsd.h b/ACE/ace/config-netbsd.h
index 563eed821cd..de28fe5de61 100644
--- a/ACE/ace/config-netbsd.h
+++ b/ACE/ace/config-netbsd.h
@@ -4,6 +4,21 @@
 #ifndef ACE_CONFIG_H
 #define ACE_CONFIG_H
 
+#ifndef ACE_MT_SAFE
+#define ACE_MT_SAFE 1
+#endif
+
+#if defined(ACE_MT_SAFE) && (ACE_MT_SAFE != 0)
+#  define ACE_HAS_THREADS 1
+#  define ACE_HAS_PTHREADS 1
+#  define ACE_HAS_PTHREADS_STD 1
+#  define ACE_HAS_PTHREADS_UNIX98_EXT 1
+#  define ACE_HAS_PTHREAD_RESUME_NP 1
+#  define ACE_HAS_PTHREAD_SUSPEND_NP 1
+#  define ACE_LACKS_PTHREAD_THR_SIGSETMASK 1
+#  define ACE_LACKS_PTHREAD_YIELD 1
+#endif /* ACE_MT_SAFE */
+
 #define ACE_HAS_CLOCK_SETTIME 1
 #define ACE_HAS_CLOCK_GETTIME 1
 #define ACE_HAS_SETTIMEOFDAY 1
@@ -36,11 +51,6 @@
 #define ACE_HAS_POSITION_INDEPENDENT_POINTERS 1
 #define ACE_HAS_POSIX_NONBLOCK 1
 #define ACE_HAS_POSIX_TIME 1
-#define ACE_HAS_PTHREADS 1
-#define ACE_HAS_PTHREADS_STD 1
-#define ACE_HAS_PTHREADS_UNIX98_EXT 1
-#define ACE_HAS_PTHREAD_RESUME_NP 1
-#define ACE_HAS_PTHREAD_SUSPEND_NP 1
 #define ACE_HAS_P_READ_WRITE 1
 #define ACE_HAS_RECURSIVE_THR_EXIT_SEMANTICS 1
 #define ACE_HAS_REENTRANT_FUNCTIONS 1
@@ -74,7 +84,6 @@
 #define ACE_HAS_TEMPLATE_SPECIALIZATION 1
 #define ACE_HAS_TEMPLATE_TYPEDEFS 1
 #define ACE_HAS_TERMIOS 1
-#define ACE_HAS_THREADS 1
 #define ACE_HAS_THREAD_SPECIFIC_STORAGE 1
 #define ACE_HAS_TIMEZONE 1
 #define ACE_HAS_TIMEZONE_GETTIMEOFDAY 1
@@ -115,7 +124,6 @@
 #define ACE_LACKS_WCSDUP 1
 #define ACE_LACKS_WCSICMP 1
 #define ACE_LACKS_WCSNICMP 1
-#define ACE_MT_SAFE 1
 #define ACE_NEW_THROWS_EXCEPTIONS 1
 #define ACE_SCANDIR_CMP_USES_CONST_VOIDPTR 1
 #define ACE_TEMPLATES_REQUIRE_SOURCE 1
diff --git a/ACE/ace/config-rtems.h b/ACE/ace/config-rtems.h
index ff95c69c73a..af54ebb2121 100644
--- a/ACE/ace/config-rtems.h
+++ b/ACE/ace/config-rtems.h
@@ -71,6 +71,7 @@
 // ... and the final standard even!
 #define ACE_HAS_PTHREADS_STD
 #define ACE_HAS_THREAD_SPECIFIC_STORAGE
+#define ACE_HAS_PTHREAD_SCHEDPARAM
 
 // XXX thread defines go here
 #define ACE_MT_SAFE 1
@@ -134,7 +135,6 @@
 #define ACE_NEEDS_HUGE_THREAD_STACKSIZE 65536
 #define ACE_NEEDS_SCHED_H
 #define ACE_HAS_POSIX_NONBLOCK
-#define ACE_LACKS_FDOPEN
 #define ACE_HAS_TERMIOS
 
 // rtems 4.7 or higher
diff --git a/ACE/apps/JAWS2/HTTPU/http_headers.cpp b/ACE/apps/JAWS2/HTTPU/http_headers.cpp
index 3f1f5bc27bb..77db706dc15 100644
--- a/ACE/apps/JAWS2/HTTPU/http_headers.cpp
+++ b/ACE/apps/JAWS2/HTTPU/http_headers.cpp
@@ -3,74 +3,83 @@
 #include "ace/RB_Tree.h"
 #include "HTTPU/http_headers.h"
 
-HTTP_Hdr_Node
-
-  HTTP_HCodes::HTTP ("HTTP", "HTTP%s %s"),
-  HTTP_HCodes::ACCEPT ("Accept", "Accept: %s\r\n"),
-  HTTP_HCodes::ACCEPTCHARSET ("Accept-Charset", "Accept-Charset: %s\r\n"),
-  HTTP_HCodes::ACCEPTENCODING ("Accept-Encoding", "Accept-Encoding: %s\r\n"),
-  HTTP_HCodes::ACCEPTLANGUAGE ("Accept-Language", "Accept-Language: %s\r\n"),
-  HTTP_HCodes::ACCEPTRANGES ("Accept-Ranges", "Accept-Ranges: %s\r\n"),
-  HTTP_HCodes::AGE ("Age", "Age: %s\r\n"),
-  HTTP_HCodes::ALLOW ("Allow", "Allow: %s\r\n"),
-  HTTP_HCodes::AUTHORIZATION ("Authorization", "Authorization: %s\r\n"),
-  HTTP_HCodes::CACHECONTROL ("Cache-Control", "Cache-Control: %s\r\n"),
-  HTTP_HCodes::CONNECTION ("Connection", "Connection: %s\r\n"),
-  HTTP_HCodes::CONTENTENCODING ("Content-Encoding",
-                                "Content-Encoding: %d\r\n"),
-  HTTP_HCodes::CONTENTLENGTH ("Content-Length", "Content-Length: %d\r\n"),
-  HTTP_HCodes::CONTENTLOCATION ("Content-Location", "Content-Location: %s\r\n"),
-  HTTP_HCodes::CONTENTMD5 ("Content-MD5", "Content-MD5: %s\r\n"),
-  HTTP_HCodes::CONTENTRANGE ("Content-Range", "Content-Range: %s\r\n"),
-  HTTP_HCodes::CONTENTTYPE ("Content-Type", "Content-Type: %s\r\n"),
-  HTTP_HCodes::DATE ("Date", "Date: %s\r\n"),
-  HTTP_HCodes::ETAG ("ETag", "ETag: %s\r\n"),
-  HTTP_HCodes::EXPECT ("Expect", "Expect: %s\r\n"),
-  HTTP_HCodes::EXPIRES ("Expires", "Expires: %s\r\n"),
-  HTTP_HCodes::FROM ("From", "From: %s\r\n"),
-  HTTP_HCodes::HOST ("Host", "Host: %s\r\n"),
-  HTTP_HCodes::IFMATCH ("If-Match", "If-Match: %s\r\n"),
-  HTTP_HCodes::IFMODIFIEDSINCE ("If-Modified-Since",
-                                "If-Modified-Since: %s\r\n"),
-  HTTP_HCodes::IFNONEMATCH ("If-None-Match", "If-None-Match: %s\r\n"),
-  HTTP_HCodes::IFRANGE ("If-Range", "If-Range: %s\r\n"),
-  HTTP_HCodes::IFUNMODIFIEDSINCE ("If-Unmodified-Since",
-                                  "If-Unmodified-Since: %s\r\n"),
-  HTTP_HCodes::LASTMODIFIED ("Last-Modified", "Last-Modified: %s\r\n"),
-  HTTP_HCodes::LOCATION ("Location", "Location: %s\r\n"),
-  HTTP_HCodes::MAXFORWARDS ("Max-Forwards", "Max-Forwards: %s\r\n"),
-  HTTP_HCodes::PRAGMA ("Pragma", "Pragma: %s\r\n"),
-  HTTP_HCodes::PROXYAUTHENTICATE ("Proxy-Authenticate",
-                                  "Proxy-Authenticate: %s\r\n"),
-  HTTP_HCodes::PROXYAUTHORIZATION ("Proxy-Authorization",
-                                   "Proxy-Authorization: %s\r\n"),
-  HTTP_HCodes::RANGE ("Range", "Range: %s\r\n"),
-  HTTP_HCodes::REFERER ("Referer", "Referer: %s\r\n"),
-  HTTP_HCodes::SERVER ("Server", "Server: %s\r\n"),
-  HTTP_HCodes::TE ("TE", "TE: %s\r\n"),
-  HTTP_HCodes::TRAILER ("Trailer", "Trailer: %s\r\n"),
-  HTTP_HCodes::TRANSFERENCODING ("Transfer-Encoding",
-                                 "Transfer-Encoding: %s\r\n"),
-  HTTP_HCodes::UPGRADE ("Ugrade", "Ugrade: %s\r\n"),
-  HTTP_HCodes::USERAGENT ("User-Agent", "User-Agent: %s\r\n"),
-  HTTP_HCodes::VARY ("Vary", "Vary: %s\r\n"),
-  HTTP_HCodes::VIA ("Via", "Via: %s\r\n"),
-  HTTP_HCodes::WARNING ("Warning", "Warning: %s\r\n"),
-  HTTP_HCodes::WWWAUTHENTICATE ("WWW-Authenticate",
-                                "WWW-Authenticate: %s\r\n"),
-  HTTP_HCodes::GET ("GET", "GET %s HTTP/%s\r\n"),
-  HTTP_HCodes::HEAD ("HEAD", "HEAD %s HTTP/%s\r\n"),
-  HTTP_HCodes::POST ("POST", "POST %s HTTP/%s\r\n"),
-  HTTP_HCodes::PUT ("PUT", "PUT %s HTTP/%s\r\n"),
-  HTTP_HCodes::QUIT ("QUIT", "QUIT %s HTTP/%s\r\n"),
-  HTTP_HCodes::DUNNO ("", ""),
-  HTTP_HCodes::META ("<META", "<META %s>"),
-  HTTP_HCodes::A ("<A", "<A %s>"),
-  HTTP_HCodes::SCRIPT ("<SCRIPT", "<SCRIPT %s>"),
-  HTTP_HCodes::APPLET ("<APPLET", "<APPLET %s>")
-
-  //////////////
-  ;
+HTTP_Hdr_Node HTTP_HCodes::HTTP ("HTTP", "HTTP%s %s");
+HTTP_Hdr_Node HTTP_HCodes::ACCEPT ("Accept", "Accept: %s\r\n");
+HTTP_Hdr_Node HTTP_HCodes::ACCEPTCHARSET ("Accept-Charset",
+                                          "Accept-Charset: %s\r\n");
+HTTP_Hdr_Node HTTP_HCodes::ACCEPTENCODING ("Accept-Encoding",
+                                           "Accept-Encoding: %s\r\n");
+HTTP_Hdr_Node HTTP_HCodes::ACCEPTLANGUAGE ("Accept-Language",
+                                           "Accept-Language: %s\r\n");
+HTTP_Hdr_Node HTTP_HCodes::ACCEPTRANGES ("Accept-Ranges",
+                                         "Accept-Ranges: %s\r\n");
+HTTP_Hdr_Node HTTP_HCodes::AGE ("Age", "Age: %s\r\n");
+HTTP_Hdr_Node HTTP_HCodes::ALLOW ("Allow", "Allow: %s\r\n");
+HTTP_Hdr_Node HTTP_HCodes::AUTHORIZATION ("Authorization",
+                                          "Authorization: %s\r\n");
+HTTP_Hdr_Node HTTP_HCodes::CACHECONTROL ("Cache-Control",
+                                         "Cache-Control: %s\r\n");
+HTTP_Hdr_Node HTTP_HCodes::CONNECTION ("Connection", "Connection: %s\r\n");
+HTTP_Hdr_Node HTTP_HCodes::CONTENTENCODING ("Content-Encoding",
+                                            "Content-Encoding: %d\r\n");
+HTTP_Hdr_Node HTTP_HCodes::CONTENTLENGTH ("Content-Length",
+                                          "Content-Length: %d\r\n");
+HTTP_Hdr_Node HTTP_HCodes::CONTENTLOCATION ("Content-Location",
+                                            "Content-Location: %s\r\n");
+HTTP_Hdr_Node HTTP_HCodes::CONTENTMD5 ("Content-MD5",
+                                       "Content-MD5: %s\r\n");
+HTTP_Hdr_Node HTTP_HCodes::CONTENTRANGE ("Content-Range",
+                                         "Content-Range: %s\r\n");
+HTTP_Hdr_Node HTTP_HCodes::CONTENTTYPE ("Content-Type",
+                                        "Content-Type: %s\r\n");
+HTTP_Hdr_Node HTTP_HCodes::DATE ("Date", "Date: %s\r\n");
+HTTP_Hdr_Node HTTP_HCodes::ETAG ("ETag", "ETag: %s\r\n");
+HTTP_Hdr_Node HTTP_HCodes::EXPECT ("Expect", "Expect: %s\r\n");
+HTTP_Hdr_Node HTTP_HCodes::EXPIRES ("Expires", "Expires: %s\r\n");
+HTTP_Hdr_Node HTTP_HCodes::FROM ("From", "From: %s\r\n");
+HTTP_Hdr_Node HTTP_HCodes::HOST ("Host", "Host: %s\r\n");
+HTTP_Hdr_Node HTTP_HCodes::IFMATCH ("If-Match", "If-Match: %s\r\n");
+HTTP_Hdr_Node HTTP_HCodes::IFMODIFIEDSINCE ("If-Modified-Since",
+                                            "If-Modified-Since: %s\r\n");
+HTTP_Hdr_Node HTTP_HCodes::IFNONEMATCH ("If-None-Match",
+                                        "If-None-Match: %s\r\n");
+HTTP_Hdr_Node HTTP_HCodes::IFRANGE ("If-Range", "If-Range: %s\r\n");
+HTTP_Hdr_Node HTTP_HCodes::IFUNMODIFIEDSINCE ("If-Unmodified-Since",
+                                              "If-Unmodified-Since: %s\r\n");
+HTTP_Hdr_Node HTTP_HCodes::LASTMODIFIED ("Last-Modified",
+                                         "Last-Modified: %s\r\n");
+HTTP_Hdr_Node HTTP_HCodes::LOCATION ("Location", "Location: %s\r\n");
+HTTP_Hdr_Node HTTP_HCodes::MAXFORWARDS ("Max-Forwards",
+                                        "Max-Forwards: %s\r\n");
+HTTP_Hdr_Node HTTP_HCodes::PRAGMA ("Pragma", "Pragma: %s\r\n");
+HTTP_Hdr_Node HTTP_HCodes::PROXYAUTHENTICATE ("Proxy-Authenticate",
+                                              "Proxy-Authenticate: %s\r\n");
+HTTP_Hdr_Node HTTP_HCodes::PROXYAUTHORIZATION ("Proxy-Authorization",
+                                               "Proxy-Authorization: %s\r\n");
+HTTP_Hdr_Node HTTP_HCodes::RANGE ("Range", "Range: %s\r\n");
+HTTP_Hdr_Node HTTP_HCodes::REFERER ("Referer", "Referer: %s\r\n");
+HTTP_Hdr_Node HTTP_HCodes::SERVER ("Server", "Server: %s\r\n");
+HTTP_Hdr_Node HTTP_HCodes::TE ("TE", "TE: %s\r\n");
+HTTP_Hdr_Node HTTP_HCodes::TRAILER ("Trailer", "Trailer: %s\r\n");
+HTTP_Hdr_Node HTTP_HCodes::TRANSFERENCODING ("Transfer-Encoding",
+                                             "Transfer-Encoding: %s\r\n");
+HTTP_Hdr_Node HTTP_HCodes::UPGRADE ("Ugrade", "Ugrade: %s\r\n");
+HTTP_Hdr_Node HTTP_HCodes::USERAGENT ("User-Agent", "User-Agent: %s\r\n");
+HTTP_Hdr_Node HTTP_HCodes::VARY ("Vary", "Vary: %s\r\n");
+HTTP_Hdr_Node HTTP_HCodes::VIA ("Via", "Via: %s\r\n");
+HTTP_Hdr_Node HTTP_HCodes::WARNING ("Warning", "Warning: %s\r\n");
+HTTP_Hdr_Node HTTP_HCodes::WWWAUTHENTICATE ("WWW-Authenticate",
+                                            "WWW-Authenticate: %s\r\n");
+HTTP_Hdr_Node HTTP_HCodes::GET ("GET", "GET %s HTTP/%s\r\n");
+HTTP_Hdr_Node HTTP_HCodes::HEAD ("HEAD", "HEAD %s HTTP/%s\r\n");
+HTTP_Hdr_Node HTTP_HCodes::POST ("POST", "POST %s HTTP/%s\r\n");
+HTTP_Hdr_Node HTTP_HCodes::PUT ("PUT", "PUT %s HTTP/%s\r\n");
+HTTP_Hdr_Node HTTP_HCodes::QUIT ("QUIT", "QUIT %s HTTP/%s\r\n");
+HTTP_Hdr_Node HTTP_HCodes::DUNNO ("", "");
+HTTP_Hdr_Node HTTP_HCodes::META ("<META", "<META %s>");
+HTTP_Hdr_Node HTTP_HCodes::A ("<A", "<A %s>");
+HTTP_Hdr_Node HTTP_HCodes::SCRIPT ("<SCRIPT", "<SCRIPT %s>");
+HTTP_Hdr_Node HTTP_HCodes::APPLET ("<APPLET", "<APPLET %s>");
 
 
 const int &HTTP_HCodes::NUM_HEADER_STRINGS
diff --git a/ACE/apps/JAWS2/HTTPU/http_headers.h b/ACE/apps/JAWS2/HTTPU/http_headers.h
index 0e23b23abf4..6a937722802 100644
--- a/ACE/apps/JAWS2/HTTPU/http_headers.h
+++ b/ACE/apps/JAWS2/HTTPU/http_headers.h
@@ -26,7 +26,7 @@ class HTTPU_Export HTTP_Hdr_Node
   friend class HTTP_HCodes;
 
 public:
-  operator const int (void) const;
+  operator int (void) const;
   operator const char * (void) const;
   const char * format (void) const;
 
diff --git a/ACE/apps/JAWS2/HTTPU/http_headers.inl b/ACE/apps/JAWS2/HTTPU/http_headers.inl
index 73ea46e57b6..3cfbaddae1b 100644
--- a/ACE/apps/JAWS2/HTTPU/http_headers.inl
+++ b/ACE/apps/JAWS2/HTTPU/http_headers.inl
@@ -7,7 +7,7 @@
 #endif /* ACE_HAS_INLINED_OSCALLS */
 
 ACE_INLINE
-HTTP_Hdr_Node::operator const int (void) const
+HTTP_Hdr_Node::operator int (void) const
 {
   return this->index_;
 }
diff --git a/ACE/apps/JAWS2/HTTPU/http_status.cpp b/ACE/apps/JAWS2/HTTPU/http_status.cpp
index 4bf70926a97..99ce69f1f58 100644
--- a/ACE/apps/JAWS2/HTTPU/http_status.cpp
+++ b/ACE/apps/JAWS2/HTTPU/http_status.cpp
@@ -5,28 +5,33 @@
 const char *
 HTTP_SCode::table_ [HTTP_SCode::SC_TABLE_SIZE];
 
-HTTP_SCode_Node
+HTTP_SCode_Node HTTP_SCode_Base::STATUS_OK (200, "OK");
+HTTP_SCode_Node HTTP_SCode_Base::STATUS_CREATED (201, "Created");
+HTTP_SCode_Node HTTP_SCode_Base::STATUS_ACCEPTED (202, "Accepted");
+HTTP_SCode_Node HTTP_SCode_Base::STATUS_NO_CONTENT (204, "No Content");
+HTTP_SCode_Node HTTP_SCode_Base::STATUS_MULTIPLE_CHOICES (300,
+                                                          "Multiple Choices");
+HTTP_SCode_Node HTTP_SCode_Base::STATUS_MOVED_PERMANENTLY (301,
+                                                           "Moved Permanently");
+HTTP_SCode_Node HTTP_SCode_Base::STATUS_MOVED_TEMPORARILY (302,
+                                                           "Moved Temporarily");
+HTTP_SCode_Node HTTP_SCode_Base::STATUS_NOT_MODIFIED (304, "Not Modified");
+HTTP_SCode_Node HTTP_SCode_Base::STATUS_INSUFFICIENT_DATA (399,
+                                                           "Insufficient Data");
+HTTP_SCode_Node HTTP_SCode_Base::STATUS_BAD_REQUEST (400, "Bad Request");
+HTTP_SCode_Node HTTP_SCode_Base::STATUS_UNAUTHORIZED (401, "Unauthorized");
+HTTP_SCode_Node HTTP_SCode_Base::STATUS_FORBIDDEN (403, "Forbidden");
+HTTP_SCode_Node HTTP_SCode_Base::STATUS_NOT_FOUND (404, "Not Found");
+HTTP_SCode_Node HTTP_SCode_Base::STATUS_INTERNAL_SERVER_ERROR (500,
+                                                               "Internal Server Error");
+HTTP_SCode_Node HTTP_SCode_Base::STATUS_NOT_IMPLEMENTED (501,
+                                                         "Not Implemented");
+HTTP_SCode_Node HTTP_SCode_Base::STATUS_BAD_GATEWAY (502, "Bad Gateway");
+HTTP_SCode_Node HTTP_SCode_Base::STATUS_SERVICE_UNAVAILABLE (503,
+                                                             "Service Unavailable");
+HTTP_SCode_Node HTTP_SCode_Base::STATUS_QUIT (599, "Quit");
 
-  HTTP_SCode_Base::STATUS_OK (200, "OK"),
-  HTTP_SCode_Base::STATUS_CREATED (201, "Created"),
-  HTTP_SCode_Base::STATUS_ACCEPTED (202, "Accepted"),
-  HTTP_SCode_Base::STATUS_NO_CONTENT (204, "No Content"),
-  HTTP_SCode_Base::STATUS_MULTIPLE_CHOICES (300, "Multiple Choices"),
-  HTTP_SCode_Base::STATUS_MOVED_PERMANENTLY (301, "Moved Permanently"),
-  HTTP_SCode_Base::STATUS_MOVED_TEMPORARILY (302, "Moved Temporarily"),
-  HTTP_SCode_Base::STATUS_NOT_MODIFIED (304, "Not Modified"),
-  HTTP_SCode_Base::STATUS_INSUFFICIENT_DATA (399, "Insufficient Data"),
-  HTTP_SCode_Base::STATUS_BAD_REQUEST (400, "Bad Request"),
-  HTTP_SCode_Base::STATUS_UNAUTHORIZED (401, "Unauthorized"),
-  HTTP_SCode_Base::STATUS_FORBIDDEN (403, "Forbidden"),
-  HTTP_SCode_Base::STATUS_NOT_FOUND (404, "Not Found"),
-  HTTP_SCode_Base::STATUS_INTERNAL_SERVER_ERROR (500, "Internal Server Error"),
-  HTTP_SCode_Base::STATUS_NOT_IMPLEMENTED (501, "Not Implemented"),
-  HTTP_SCode_Base::STATUS_BAD_GATEWAY (502, "Bad Gateway"),
-  HTTP_SCode_Base::STATUS_SERVICE_UNAVAILABLE (503, "Service Unavailable"),
-  HTTP_SCode_Base::STATUS_QUIT (599, "Quit"),
-
-  HTTP_SCode_Base::DUMMY (0, 0);
+HTTP_SCode_Node HTTP_SCode_Base::DUMMY (0, 0);
 
 HTTP_SCode_Node::HTTP_SCode_Node (int code, const char *code_str)
   : code_ (code),
diff --git a/ACE/bin/tao_orb_tests.lst b/ACE/bin/tao_orb_tests.lst
index bf624c55477..f6579a83016 100644
--- a/ACE/bin/tao_orb_tests.lst
+++ b/ACE/bin/tao_orb_tests.lst
@@ -227,9 +227,9 @@ TAO/tests/Portable_Interceptors/AdvSlotExt/run_test.pl: !MINIMUM !CORBA_E_COMPAC
 TAO/tests/ORT/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !DISABLE_INTERCEPTORS
 TAO/tests/Object_Loader/run_test.pl: !VxWorks !STATIC
 TAO/tests/Two_Objects/run_test.pl: !ST
-TAO/tests/TransportCurrent/Framework/run_test.pl: !ST
-TAO/tests/TransportCurrent/IIOP/run_test.pl -dynamic: !ST
-TAO/tests/TransportCurrent/IIOP/run_test.pl -static: ST
+TAO/tests/TransportCurrent/Framework/run_test.pl: !STATIC
+TAO/tests/TransportCurrent/IIOP/run_test.pl -dynamic: !STATIC
+TAO/tests/TransportCurrent/IIOP/run_test.pl -static: STATIC
 TAO/tests/UNKNOWN_Exception/run_test.pl: Exceptions
 TAO/tests/Native_Exceptions/run_test.pl: Exceptions
 TAO/tests/Servant_To_Reference_Test/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ST
diff --git a/ACE/include/makeinclude/platform_lynxos.GNU b/ACE/include/makeinclude/platform_lynxos.GNU
index 47ac90b5f32..6249592e166 100644
--- a/ACE/include/makeinclude/platform_lynxos.GNU
+++ b/ACE/include/makeinclude/platform_lynxos.GNU
@@ -67,15 +67,7 @@ endif # ! LynxOS
 LYNXOS_MAJOR = $(shell echo $(VERSION) | awk -F. '{print $$1;}')
 LYNXOS_MINOR = $(shell echo $(VERSION) | awk -F. '{print $$2;}')
 
-ifeq ($(shared_libs_only),1)
-  shared_libs = 1
-  static_libs =
-endif
-ifeq ($(static_libs_only),1)
-  shared_libs =
-  static_libs = 1
-endif
-
+shared_libs ?= 1
 optimize ?= 1
 debug ?= 1
 pipes ?= 1
@@ -108,8 +100,9 @@ ifeq ($(threads),1)
 endif
 
 ifeq ($(shared_libs),1)
-  CFLAGS  += -mshared -DACE_HAS_SVR4_DYNAMIC_LINKING
-  SOFLAGS += -mshared -DACE_HAS_SVR4_DYNAMIC_LINKING
+  CPPFLAGS += -DACE_HAS_SVR4_DYNAMIC_LINKING
+  CFLAGS   += -mshared
+  SOFLAGS  += -mshared
   LIBS    += -ldl
 else
   LIBS    += -lnetinet -lnsl
@@ -118,7 +111,7 @@ endif
 CC              = gcc
 CXX             = g++
 CFLAGS          += -Wpointer-arith -Wall
-CFLAGS          += -DACE_LYNXOS_MAJOR=$(LYNXOS_MAJOR) -DACE_LYNXOS_MINOR=$(LYNXOS_MINOR)
+CPPFLAGS        += -DACE_LYNXOS_MAJOR=$(LYNXOS_MAJOR) -DACE_LYNXOS_MINOR=$(LYNXOS_MINOR)
 DCFLAGS         += -g
 PIC             = -fPIC
 DLD             = $(CXX)
diff --git a/ACE/include/makeinclude/rules.bin.GNU b/ACE/include/makeinclude/rules.bin.GNU
index 9337721ce52..1e30819c6de 100644
--- a/ACE/include/makeinclude/rules.bin.GNU
+++ b/ACE/include/makeinclude/rules.bin.GNU
@@ -42,16 +42,6 @@ ifeq ($(VXWORKSLINK),true)
 $(BIN): $(DEFAULTRULE)
 	mv $(DEFAULTRULE) $@
 else # !VXWORKSLINK
-ifeq ($(CHORUSLINK),true)
-$(BIN): %: $(VDIR)%.$(OBJEXT) $(VOBJS)
-	$(LINK.cc) $(CC_OUTPUT_FLAG) $@ $(sort $(VDIR)$@.$(OBJEXT) $(VOBJS)) $(VLDLIBS) $(LDFLAGS) $(POSTLINK)
-#	$(MERGEDIR)/dtool/mkctors $@.xp.o > $@.ct.s
-#	$(CXX) -c $@.ct.s
-#	$(RM) $@.ct.s
-#	$(LD) $(LDOPTIONS) -e _start -o $@ $(MERGEDIR)/lib/crt/crth.u.o $(MERGEDIR)/lib/crt/crt0.o $(MERGEDIR)/lib/crt/crti.o $@.xp.o $@.ct.o $(MERGEDIR)/lib/crt/crtn.o -dn -T $(MERGEDIR)/src/act/slots/act_u.ld
-#	$(RM) $@.xp.o
-#	$(RM) $@.ct.o
-else # !CHORUSLINK
   ifeq (1,$(using_aix_vacpp))
 $(BIN): %: %.icc $(SRC)
 	vacbld_r $< -severitylevel=warning
@@ -60,4 +50,3 @@ $(BIN): %: $(VDIR)%.$(OBJEXT) $(VOBJS)
 	$(LINK.cc) $(LDFLAGS) $(CC_OUTPUT_FLAG) $@ $(sort $(VDIR)$@.$(OBJEXT) $(VOBJS)) $(VLDLIBS) $(POSTLINK)
   endif # using_aix_vacpp
 endif
-endif
diff --git a/ACE/tests/OS_Test.cpp b/ACE/tests/OS_Test.cpp
index a27737dd5e8..acfb9370b1c 100644
--- a/ACE/tests/OS_Test.cpp
+++ b/ACE/tests/OS_Test.cpp
@@ -547,6 +547,9 @@ snprintf_test (void)
 
   ACE_OS::memset(buf, 0xab, 2*BUFFER_SIZE);
   retval = ACE_OS::snprintf (buf, BUFFER_SIZE, "%d", 1234);
+
+  // HP-UX has broken vsnprintf
+#if !defined (HPUX)
   if (retval != 4)
     {
       ACE_ERROR ((LM_ERROR,
@@ -554,6 +557,7 @@ snprintf_test (void)
                   retval));
       ++error_count;
     }
+#endif /* !HPUX */
 
   if (buf[3] != 0)
     {
diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 07ea9a7e637..eb1825275cb 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,60 @@
+Thu Dec 21 21:29:47 UTC 2006  Iliyan Jeliazkov  <iliyan@ociweb.com>
+
+        * tao/TransportCurrent/Current_ORBInitializer_Base.cpp:
+        * tests/TransportCurrent/Framework/Client_Request_Interceptor.h:
+        * tests/TransportCurrent/Framework/Server_Request_Interceptor.h:
+        * tests/TransportCurrent/Framework/simple.cpp:
+
+          Fixed FUZZ problems.
+
+Thu Dec 21 17:49:24 UTC 2006  Iliyan Jeliazkov  <iliyan@ociweb.com>
+
+        * tests/TransportCurrent/IIOP/Current_Test_Impl.cpp:
+        * tests/TransportCurrent/IIOP/IIOP_Server_Request_Interceptor.h:
+
+          Updated the include files' path to resolve a compilation problem
+          in an autoconf (FC4_autoconf) build.
+
+Thu Dec 21 16:03:08 UTC 2006  Iliyan Jeliazkov  <iliyan@ociweb.com>
+
+        * tao/TransportCurrent/IIOP_Current_Impl.cpp:
+
+          Added conditional compilation, based upon the presence of
+          TAO_HAS_IIOP.  The IIOP-specific current will compile and the
+          implementation shall throw CORBA::NO_IMPLEMENT at runtime.
+
+Thu Dec 21 15:32:49 UTC 2006  Iliyan Jeliazkov  <iliyan@ociweb.com>
+
+        * tao/TransportCurrent/Current_Impl.h:
+        * tao/TransportCurrent/Current_Impl.cpp:
+        * tao/TransportCurrent/Current_Loader.h:
+        * tao/TransportCurrent/Current_ORBInitializer.h:
+        * tao/TransportCurrent/Current_ORBInitializer_Base.h:
+        * tao/TransportCurrent/IIOP_Current_Impl.h:
+
+        * tests/TransportCurrent/Framework/Client_Request_Interceptor.h:
+        * tests/TransportCurrent/Framework/Client_Request_Interceptor.cpp:
+        * tests/TransportCurrent/Framework/ORBInitializer_T.h:
+        * tests/TransportCurrent/Framework/Server_Request_Interceptor.h:
+        * tests/TransportCurrent/IIOP/IIOP_Server_Request_Interceptor.h:
+
+          Removed a ';' after the closing curly brace of a namespace
+          declaration which caused hiccups with gcc 4.0.2.
+
+Thu Dec 21 14:46:46 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
+
+        * tao/TransportCurrent/TC.idl:
+        * tao/TransportCurrent/TC_IIOP.idl:
+
+          Change #include files to be relative to ${TAO_ROOT} like the
+          other *.idl / *.pidl files.
+
+Thu Dec 21 14:00:11 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
+
+        * tao/Makefile.am:
+
+          Regenerated.
+
 Wed Dec 20 21:14:11 UTC 2006  Iliyan Jeliazkov  <iliyan@ociweb.com>
 
         * tao/TransportCurrent/Current_Loader.h:
diff --git a/TAO/tao/Makefile.am b/TAO/tao/Makefile.am
index 24e70d81b94..681116651f4 100644
--- a/TAO/tao/Makefile.am
+++ b/TAO/tao/Makefile.am
@@ -5753,7 +5753,7 @@ CLEANFILES += \
 TransportCurrent/TCC.cpp TransportCurrent/TCC.h TransportCurrent/TCC.inl TransportCurrent/TCS.cpp TransportCurrent/TCS.h TransportCurrent/TCS.inl: TransportCurrent/TC-stamp
 
 TransportCurrent/TC-stamp: $(srcdir)/TransportCurrent/TC.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_include=tao/TransportCurrent/Transport_Current_Export.h -Wb,export_macro=TAO_Transport_Current_Export $(srcdir)/TransportCurrent/TC.idl
+	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_include=tao/TransportCurrent/Transport_Current_Export.h -Wb,export_macro=TAO_Transport_Current_Export -o TransportCurrent -I./TransportCurrent $(srcdir)/TransportCurrent/TC.idl
 	@touch $@
 
 lib_LTLIBRARIES += libTAO_TC.la
@@ -5823,7 +5823,7 @@ CLEANFILES += \
 TransportCurrent/TC_IIOPC.cpp TransportCurrent/TC_IIOPC.h TransportCurrent/TC_IIOPC.inl TransportCurrent/TC_IIOPS.cpp TransportCurrent/TC_IIOPS.h TransportCurrent/TC_IIOPS.inl: TransportCurrent/TC_IIOP-stamp
 
 TransportCurrent/TC_IIOP-stamp: $(srcdir)/TransportCurrent/TC_IIOP.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_include=tao/TransportCurrent/Transport_Current_Export.h -Wb,export_macro=TAO_Transport_Current_Export $(srcdir)/TransportCurrent/TC_IIOP.idl
+	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_include=tao/TransportCurrent/Transport_Current_Export.h -Wb,export_macro=TAO_Transport_Current_Export -o TransportCurrent -I./TransportCurrent $(srcdir)/TransportCurrent/TC_IIOP.idl
 	@touch $@
 
 lib_LTLIBRARIES += libTAO_TC_IIOP.la
diff --git a/TAO/tao/TransportCurrent/Current_Impl.cpp b/TAO/tao/TransportCurrent/Current_Impl.cpp
index 1965dd5bea2..3dab7b8c310 100644
--- a/TAO/tao/TransportCurrent/Current_Impl.cpp
+++ b/TAO/tao/TransportCurrent/Current_Impl.cpp
@@ -1,4 +1,4 @@
-// $Id:$
+// $Id$
 
 #include "tao/Transport.h"
 #include "tao/Transport_Selection_Guard.h"
@@ -98,9 +98,9 @@ namespace TAO
       return msecs;
     }
 
-  };
+  }
 
-};
+}
 
 TAO_END_VERSIONED_NAMESPACE_DECL
 
diff --git a/TAO/tao/TransportCurrent/Current_Impl.h b/TAO/tao/TransportCurrent/Current_Impl.h
index 02e7df88e11..68731b626ec 100644
--- a/TAO/tao/TransportCurrent/Current_Impl.h
+++ b/TAO/tao/TransportCurrent/Current_Impl.h
@@ -108,16 +108,12 @@ namespace TAO
 
       };
 
-  };
+  }
 
-};
+}
 
 TAO_END_VERSIONED_NAMESPACE_DECL
 
-/* #if defined (__ACE_INLINE__) */
-/* # include "Current_Impl.inl" */
-/* #endif /\* __ACE_INLINE__ *\/ */
-
 #include /**/ "ace/post.h"
 
 #endif /* CURRENT_IMPL_H */
diff --git a/TAO/tao/TransportCurrent/Current_Loader.h b/TAO/tao/TransportCurrent/Current_Loader.h
index a5e8155b79f..1cb998ebcd7 100644
--- a/TAO/tao/TransportCurrent/Current_Loader.h
+++ b/TAO/tao/TransportCurrent/Current_Loader.h
@@ -56,8 +56,8 @@ namespace TAO
       ORBInitializer_Registry_Adapter* oir_;
     };
 
-  };
-};
+  }
+}
 
 
 #if defined (TAO_AS_STATIC_LIBS)
@@ -66,8 +66,8 @@ namespace TAO
   namespace Transport
   {
     int current_static_initializer (void);
-  };
-};
+  }
+}
 
 #endif /* defined (TAO_AS_STATIC_LIBS) */
 
diff --git a/TAO/tao/TransportCurrent/Current_ORBInitializer.h b/TAO/tao/TransportCurrent/Current_ORBInitializer.h
index 8d477c76f46..0916493fa60 100644
--- a/TAO/tao/TransportCurrent/Current_ORBInitializer.h
+++ b/TAO/tao/TransportCurrent/Current_ORBInitializer.h
@@ -46,8 +46,9 @@ namespace TAO
         ACE_THROW_SPEC ((CORBA::SystemException));
     };
 
-  };
-};
+  }
+
+}
 
 TAO_END_VERSIONED_NAMESPACE_DECL
 
diff --git a/TAO/tao/TransportCurrent/Current_ORBInitializer_Base.cpp b/TAO/tao/TransportCurrent/Current_ORBInitializer_Base.cpp
index 05c7d100dd3..bcd2e7d3d3c 100644
--- a/TAO/tao/TransportCurrent/Current_ORBInitializer_Base.cpp
+++ b/TAO/tao/TransportCurrent/Current_ORBInitializer_Base.cpp
@@ -54,6 +54,8 @@ namespace TAO
       Current_var current (this->make_current_instance (tao_info->orb_core (),
                                                         tss_slot
                                                         ACE_ENV_ARG_PARAMETER));
+      ACE_CHECK;
+
 
       info->register_initial_reference (ACE_TEXT_ALWAYS_CHAR (this->id_.fast_rep ()),
                                         current.in ());
diff --git a/TAO/tao/TransportCurrent/Current_ORBInitializer_Base.h b/TAO/tao/TransportCurrent/Current_ORBInitializer_Base.h
index 77799dca1f4..0ebd2c3849a 100644
--- a/TAO/tao/TransportCurrent/Current_ORBInitializer_Base.h
+++ b/TAO/tao/TransportCurrent/Current_ORBInitializer_Base.h
@@ -59,8 +59,9 @@ namespace TAO
         const ACE_TString id_;
       };
 
-  };
-};
+  }
+
+}
 
 TAO_END_VERSIONED_NAMESPACE_DECL
 
diff --git a/TAO/tao/TransportCurrent/IIOP_Current_Impl.cpp b/TAO/tao/TransportCurrent/IIOP_Current_Impl.cpp
index 435a54eab6a..cb8fb4cd277 100644
--- a/TAO/tao/TransportCurrent/IIOP_Current_Impl.cpp
+++ b/TAO/tao/TransportCurrent/IIOP_Current_Impl.cpp
@@ -9,6 +9,7 @@
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
+
 namespace TAO
 {
   namespace Transport
@@ -24,6 +25,7 @@ namespace TAO
     IIOP_Current_Impl::handler (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
       ACE_THROW_SPEC ((::CORBA::SystemException, NoContext))
     {
+#if defined (TAO_HAS_IIOP) && (TAO_HAS_IIOP != 0)
       const TAO_Transport* t = this->transport ();
       if (t == 0)
         ACE_THROW_RETURN (::CORBA::NO_IMPLEMENT (), 0);
@@ -33,6 +35,9 @@ namespace TAO
         ACE_THROW_RETURN (::CORBA::NO_IMPLEMENT (), 0);
 
       return static_cast <TAO_IIOP_Connection_Handler*> (ch);
+#else
+      ACE_THROW_RETURN (::CORBA::NO_IMPLEMENT (), 0);
+#endif
     }
 
 
@@ -54,9 +59,13 @@ namespace TAO
     IIOP_Current_Impl::id (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((::CORBA::SystemException, NoContext))
     {
+#if defined (TAO_HAS_IIOP) && (TAO_HAS_IIOP != 0)
       // Need to use cast to pacify windows compilers complaining
       // about the implicit HANDLE -> CORBA::Long conversion.
       return (CORBA::Long) this->handler ()->get_handle ();
+#else
+      ACE_THROW_RETURN (::CORBA::NO_IMPLEMENT (), 0);
+#endif
     }
 
     ::SSLIOP::Current_ptr
@@ -71,6 +80,7 @@ namespace TAO
     IIOP_Current_Impl::remote_port (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((::CORBA::SystemException, NoContext))
     {
+#if defined (TAO_HAS_IIOP) && (TAO_HAS_IIOP != 0)
       TAO_IIOP_Connection_Handler *iiopch =
         this->handler ();
 
@@ -78,12 +88,16 @@ namespace TAO
       iiopch->peer ().get_remote_addr (a);
 
       return a.get_port_number ();
+#else
+      ACE_THROW_RETURN (::CORBA::NO_IMPLEMENT (), 0);
+#endif
     }
 
     char*
     IIOP_Current_Impl::remote_host (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((::CORBA::SystemException, NoContext))
     {
+#if defined (TAO_HAS_IIOP) && (TAO_HAS_IIOP != 0)
       TAO_IIOP_Connection_Handler *iiopch =
         this->handler ();
 
@@ -91,12 +105,16 @@ namespace TAO
       iiopch->peer ().get_remote_addr (a);
 
       return CORBA::string_dup (a.get_host_addr ());
+#else
+      ACE_THROW_RETURN (::CORBA::NO_IMPLEMENT (), 0);
+#endif
     }
 
     CORBA::Long
     IIOP_Current_Impl::local_port (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((::CORBA::SystemException, NoContext))
     {
+#if defined (TAO_HAS_IIOP) && (TAO_HAS_IIOP != 0)
       TAO_IIOP_Connection_Handler *iiopch =
         this->handler ();
 
@@ -104,12 +122,16 @@ namespace TAO
       iiopch->peer ().get_local_addr (a);
 
       return a.get_port_number ();
+#else
+      ACE_THROW_RETURN (::CORBA::NO_IMPLEMENT (), 0);
+#endif
     }
 
     char*
     IIOP_Current_Impl::local_host (ACE_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((::CORBA::SystemException, NoContext))
     {
+#if defined (TAO_HAS_IIOP) && (TAO_HAS_IIOP != 0)
       TAO_IIOP_Connection_Handler *iiopch =
         this->handler ();
 
@@ -117,6 +139,9 @@ namespace TAO
       iiopch->peer ().get_local_addr (a);
 
       return CORBA::string_dup (a.get_host_addr ());
+#else
+      ACE_THROW_RETURN (::CORBA::NO_IMPLEMENT (), 0);
+#endif
     }
 
   }
diff --git a/TAO/tao/TransportCurrent/IIOP_Current_Impl.h b/TAO/tao/TransportCurrent/IIOP_Current_Impl.h
index 9ede80bec9a..a39f527b50e 100644
--- a/TAO/tao/TransportCurrent/IIOP_Current_Impl.h
+++ b/TAO/tao/TransportCurrent/IIOP_Current_Impl.h
@@ -98,8 +98,9 @@ namespace TAO
         //@}
 
       };
-  };
-};
+  }
+
+}
 
 TAO_END_VERSIONED_NAMESPACE_DECL
 
diff --git a/TAO/tao/TransportCurrent/TC.idl b/TAO/tao/TransportCurrent/TC.idl
index 6f6b5684790..152da12caa6 100644
--- a/TAO/tao/TransportCurrent/TC.idl
+++ b/TAO/tao/TransportCurrent/TC.idl
@@ -11,8 +11,8 @@
 #ifndef TAO_TRANSPORT_CURRENT_IDL
 #define TAO_TRANSPORT_CURRENT_IDL
 
-#include <IOP.pidl>
-#include <TimeBase.pidl>
+#include "tao/IOP.pidl"
+#include "tao/TimeBase.pidl"
 
 module TAO
 {
diff --git a/TAO/tao/TransportCurrent/TC_IIOP.idl b/TAO/tao/TransportCurrent/TC_IIOP.idl
index 17c87602d0a..91dfe1f43d5 100644
--- a/TAO/tao/TransportCurrent/TC_IIOP.idl
+++ b/TAO/tao/TransportCurrent/TC_IIOP.idl
@@ -3,7 +3,7 @@
  *
  * @brief Defines the TAO::Transport::IIOP::Current interface
  *
- * $Id:$
+ * $Id$
  *
  * @author Iliyan Jeliazkov <iliyan@ociweb.com>
  */
@@ -11,7 +11,7 @@
 #ifndef TAO_TRANSPORT_IIOP_CURRENT_IDL
 #define TAO_TRANSPORT_IIOP_CURRENT_IDL
 
-#include "TC.idl"
+#include "tao/TransportCurrent/TC.idl"
 
 /// Provide a forward reference for the SSLIOP::Current
 module SSLIOP
diff --git a/TAO/tests/TransportCurrent/Framework/Client_Request_Interceptor.cpp b/TAO/tests/TransportCurrent/Framework/Client_Request_Interceptor.cpp
index 51e7fa04b31..3bc808cbce1 100644
--- a/TAO/tests/TransportCurrent/Framework/Client_Request_Interceptor.cpp
+++ b/TAO/tests/TransportCurrent/Framework/Client_Request_Interceptor.cpp
@@ -10,13 +10,6 @@ ACE_RCSID (ForwardRequest,
 #include "Client_Request_Interceptor.h"
 #include "ORBInitializer_T.h"
 
-//   // A specialization to handle client-side interceptors
-//   template <>
-//   void ORBInitializer<PortableInterceptor::ClientRequestInterceptor>::post_init
-//     (PortableInterceptor::ORBInitInfo* oii ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-//       ACE_THROW_SPEC ((CORBA::SystemException));
-
-
 namespace Test
 {
 
@@ -25,12 +18,13 @@ namespace Test
   // A specialization to handle client-side interceptors
   template <>
   void
-  ORBInitializer<PortableInterceptor::ClientRequestInterceptor>::post_init (PortableInterceptor::ORBInitInfo* oii
-                                                                            ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+  ORBInitializer<PortableInterceptor::ClientRequestInterceptor>::post_init
+    (PortableInterceptor::ORBInitInfo* oii
+     ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException))
   {
     oii->add_client_request_interceptor (this->interceptor_.in ());
-  };
+  }
 
   Client_Request_Interceptor::Client_Request_Interceptor (const char *orb_id,
                                                           TEST test)
diff --git a/TAO/tests/TransportCurrent/Framework/Client_Request_Interceptor.h b/TAO/tests/TransportCurrent/Framework/Client_Request_Interceptor.h
index 4c35f70aba6..3440a3e9288 100644
--- a/TAO/tests/TransportCurrent/Framework/Client_Request_Interceptor.h
+++ b/TAO/tests/TransportCurrent/Framework/Client_Request_Interceptor.h
@@ -28,12 +28,6 @@
 #include "tao/ORB.h"
 #include "tao/CORBA_String.h"
 
-#if defined(_MSC_VER)
-#pragma warning(push)
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
-
 namespace Test
 {
 
@@ -135,10 +129,6 @@ namespace Test
     TEST test_;
   };
 
-}; // namespace Test
-
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif /* _MSC_VER */
+} // namespace Test
 
 #endif  /* CLIENT_REQUEST_INTERCEPTOR_H */
diff --git a/TAO/tests/TransportCurrent/Framework/ORBInitializer_T.h b/TAO/tests/TransportCurrent/Framework/ORBInitializer_T.h
index c62e53fefb9..9d4a089e343 100644
--- a/TAO/tests/TransportCurrent/Framework/ORBInitializer_T.h
+++ b/TAO/tests/TransportCurrent/Framework/ORBInitializer_T.h
@@ -21,9 +21,6 @@
 
 #include "tao/PI/PI.h"
 #include "tao/PortableInterceptorC.h"
-/* #include "tao/LocalObject.h" */
-/* #include "tao/ORB.h" */
-/* #include "tao/CORBA_String.h" */
 
 namespace Test
 {
@@ -55,7 +52,7 @@ namespace Test
     typename Interceptor::_var_type interceptor_;
   };
 
-};
+}
 
 #endif  /* ORBINITIALIZER_T_H */
 
diff --git a/TAO/tests/TransportCurrent/Framework/Server_Request_Interceptor.h b/TAO/tests/TransportCurrent/Framework/Server_Request_Interceptor.h
index 8dffec9ab9a..e263c6c427d 100644
--- a/TAO/tests/TransportCurrent/Framework/Server_Request_Interceptor.h
+++ b/TAO/tests/TransportCurrent/Framework/Server_Request_Interceptor.h
@@ -30,11 +30,6 @@
 #include "tao/LocalObject.h"
 #include "tao/PI_Server/PI_Server.h"
 
-#if defined(_MSC_VER)
-#pragma warning(push)
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
 #include "ORBInitializer_T.h"
 
 namespace Test
@@ -130,10 +125,6 @@ namespace Test
   void ORBInitializer<PortableInterceptor::ServerRequestInterceptor>::post_init
     (PortableInterceptor::ORBInitInfo* oii ACE_ENV_ARG_DECL_WITH_DEFAULTS)
       ACE_THROW_SPEC ((CORBA::SystemException));
-};
-
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif /* _MSC_VER */
+}
 
 #endif  /* SERVER_REQUEST_INTERCEPTOR_H */
diff --git a/TAO/tests/TransportCurrent/Framework/simple.cpp b/TAO/tests/TransportCurrent/Framework/simple.cpp
index d301278536d..2b945f788c1 100644
--- a/TAO/tests/TransportCurrent/Framework/simple.cpp
+++ b/TAO/tests/TransportCurrent/Framework/simple.cpp
@@ -21,9 +21,11 @@ testCurrentORBInitializer (int argc, char *argv[])
   CORBA::Object_var obj =
     orb->resolve_initial_references ("TAO::Transport::Current"
                                      ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK;
 
   if (obj.in () == 0)
-    ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("Unable to get the Transport Current\n")), -1);
+    ACE_ERROR_RETURN ((LM_ERROR,
+                       ACE_TEXT ("Unable to get the Transport Current\n")), -1);
 
 
   ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("testCurrentORBInitializer: OK\n")));
diff --git a/TAO/tests/TransportCurrent/IIOP/Current_Test_Impl.cpp b/TAO/tests/TransportCurrent/IIOP/Current_Test_Impl.cpp
index e22c5942c22..0d3c952a2fb 100644
--- a/TAO/tests/TransportCurrent/IIOP/Current_Test_Impl.cpp
+++ b/TAO/tests/TransportCurrent/IIOP/Current_Test_Impl.cpp
@@ -1,9 +1,9 @@
 // -*- C++ -*-
 
-#include "tao/Transport_Current/TC_IIOPC.h"
-#include "tao/Transport_Current/TCC.h"
+#include "tao/TransportCurrent/TC_IIOPC.h"
+#include "tao/TransportCurrent/TCC.h"
 
-#include "Current_Test_Impl.h"
+#include "tests/TransportCurrent/Framework/Current_Test_Impl.h"
 
 ACE_RCSID (Transport_Current,
            Current_Test_Impl,
diff --git a/TAO/tests/TransportCurrent/IIOP/IIOP_Server_Request_Interceptor.h b/TAO/tests/TransportCurrent/IIOP/IIOP_Server_Request_Interceptor.h
index 914b51b4bb1..fcfd6a8ea00 100644
--- a/TAO/tests/TransportCurrent/IIOP/IIOP_Server_Request_Interceptor.h
+++ b/TAO/tests/TransportCurrent/IIOP/IIOP_Server_Request_Interceptor.h
@@ -23,13 +23,9 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "Server_Request_Interceptor.h"
 #include "tao/TransportCurrent/IIOP_Transport_Current.h"
 
-#if defined(_MSC_VER)
-#pragma warning(push)
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
+#include "tests/TransportCurrent/Framework/Server_Request_Interceptor.h"
 
 namespace Test
 {
@@ -153,10 +149,6 @@ namespace Test
     EndPoint endPoints_[1001];
   };
 
-}; /* namespace Test */
-
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif /* _MSC_VER */
+} // namespace Test
 
 #endif  /* ISERVER_REQUEST_INTERCEPTOR_H */