Minor changes and add portspan for DIOP to the NEWS file

    * TAO/NEWS:
    * TAO/tests/ORB_portspan/README:
    * TAO/tests/ORB_portspan/server.cpp:
    * TAO/tests/ORB_portspan/simpleI.cpp:
    * TAO/tests/ORB_portspan/simpleI.h:

5 files changed, 14 insertions, 61 deletions

diff --git a/TAO/NEWS b/TAO/NEWS
index 38c123a5b32..5ce0657fccc 100644
--- a/TAO/NEWS
+++ b/TAO/NEWS
@@ -7,6 +7,8 @@ USER VISIBLE CHANGES BETWEEN TAO-2.5.12 and TAO-3.0.0
 . Fixed some CORBA spec mismatches for the CORBA server
   portable interceptors
 
+. Add portspan support to DIOP
+
 USER VISIBLE CHANGES BETWEEN TAO-2.5.11 and TAO-2.5.12
 ======================================================
 
diff --git a/TAO/tests/ORB_portspan/README b/TAO/tests/ORB_portspan/README
index bff4bde3645..3979d11ffba 100644
--- a/TAO/tests/ORB_portspan/README
+++ b/TAO/tests/ORB_portspan/README
@@ -1,5 +1,3 @@
-
-
 portspan Test
 -------------
 
@@ -17,5 +15,5 @@ The test accepts the following mutually-exclusive protocol arguments to
 determine which protocol gets tested for portspan support. You must supply
 exactly one of these arguments:
 
-• -iiop
+• -iiop
 • -diop
diff --git a/TAO/tests/ORB_portspan/server.cpp b/TAO/tests/ORB_portspan/server.cpp
index e5e58917cdd..e919bb37005 100644
--- a/TAO/tests/ORB_portspan/server.cpp
+++ b/TAO/tests/ORB_portspan/server.cpp
@@ -5,7 +5,6 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 {
   try
     {
-
       CORBA::ORB_var orb = CORBA::ORB_init(argc, argv);
 
       CORBA::Object_var obj = orb->resolve_initial_references("RootPOA");
@@ -22,7 +21,6 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 
       orb->run();
     }
-
   catch (const CORBA::Exception& ex)
     {
       ex._tao_print_exception ("Exception in main():");
diff --git a/TAO/tests/ORB_portspan/simpleI.cpp b/TAO/tests/ORB_portspan/simpleI.cpp
index ce6324fb1e6..d9732bf14df 100644
--- a/TAO/tests/ORB_portspan/simpleI.cpp
+++ b/TAO/tests/ORB_portspan/simpleI.cpp
@@ -1,35 +1,11 @@
-// -*- C++ -*-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-//
-// Information about TAO is available at:
-//     http://www.dre.vanderbilt.edu/~schmidt/TAO.html
-
 #include "simpleI.h"
 
 // Implementation skeleton constructor
-simple_i::simple_i (void)
-  {
-  }
-
-// Implementation skeleton destructor
-simple_i::~simple_i (void)
-  {
-  }
-
-void simple_i::test (
-  )
-  {
-    //Add your implementation here
-  }
+simple_i::simple_i ()
+{
+}
+
+void simple_i::test ()
+{
+  //Add your implementation here
+}
diff --git a/TAO/tests/ORB_portspan/simpleI.h b/TAO/tests/ORB_portspan/simpleI.h
index f1585e382e5..8ce06ce9497 100644
--- a/TAO/tests/ORB_portspan/simpleI.h
+++ b/TAO/tests/ORB_portspan/simpleI.h
@@ -1,21 +1,3 @@
-// -*- C++ -*-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-//
-// Information about TAO is available at:
-//     http://www.dre.vanderbilt.edu/~schmidt/TAO.html
-
 #ifndef SIMPLEI_H_
 #define SIMPLEI_H_
 
@@ -30,15 +12,12 @@ class  simple_i : public virtual POA_simple
 {
 public:
   //Constructor
-  simple_i (void);
+  simple_i ();
 
   //Destructor
-  virtual ~simple_i (void);
-
-virtual void test (
-  );
+  ~simple_i () override = default;
 
+  void test () override;
 };
 
-
 #endif /* SIMPLEI_H_  */