Wed Jun 29 11:27:19 UTC 2011 Johnny Willemsen <jwillemsen@remedy.nl>

        * tests/OBV/Simple/Client_i.h:
        * tests/OBV/Simple/OBV_impl.h:
        * tests/OBV/Simple/Server_i.h:
        * tests/OBV/Simple/Server_i.cpp:
        * tests/OBV/Simple/server.cpp:
          Cleanup

6 files changed, 13 insertions, 21 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 28ded7726dd..82819a7a47b 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,12 @@
+Wed Jun 29 11:27:19 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tests/OBV/Simple/Client_i.h:
+        * tests/OBV/Simple/OBV_impl.h:
+        * tests/OBV/Simple/Server_i.h:
+        * tests/OBV/Simple/Server_i.cpp:
+        * tests/OBV/Simple/server.cpp:
+          Cleanup
+
 Wed Jun 29 11:13:02 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
 
         * tao/AnyTypeCode/TypeCode_Case_T.h:
diff --git a/TAO/tests/OBV/Simple/Client_i.h b/TAO/tests/OBV/Simple/Client_i.h
index 296bf588550..69f6d7794d4 100644
--- a/TAO/tests/OBV/Simple/Client_i.h
+++ b/TAO/tests/OBV/Simple/Client_i.h
@@ -38,7 +38,7 @@ public:
   Checkpoint_Client_i (void);
 
   /// Destructor
-  virtual  ~Checkpoint_Client_i (void);
+  virtual ~Checkpoint_Client_i (void);
 
   /// Execute the methods
   virtual int run (const char *,int, ACE_TCHAR** );
diff --git a/TAO/tests/OBV/Simple/OBV_impl.h b/TAO/tests/OBV/Simple/OBV_impl.h
index 7ef69a968b9..4164a6ff96b 100644
--- a/TAO/tests/OBV/Simple/OBV_impl.h
+++ b/TAO/tests/OBV/Simple/OBV_impl.h
@@ -5,7 +5,6 @@
 #define OBV_IMPL_H
 
 #include "OBVC.h"
-
 #include "tao/Valuetype/ValueFactory.h"
 
 class Event_impl : public virtual OBV_Event,
@@ -16,23 +15,18 @@ class Event_impl : public virtual OBV_Event,
   Event_impl (CORBA::Long value);
   virtual ~Event_impl ();
   virtual CORBA::ValueBase* _copy_value (void);
-
-
   virtual void do_print (void);
 };
 
 class Event_factory : public CORBA::ValueFactoryBase
 {
 public:
-
   // create (...) would go here
 
 protected:
-
   virtual ~Event_factory ();
 
 private:
-
   TAO_OBV_CREATE_RETURN_TYPE (Event) create_for_unmarshal (void);
 };
 
diff --git a/TAO/tests/OBV/Simple/Server_i.cpp b/TAO/tests/OBV/Simple/Server_i.cpp
index ad21429c1f8..498547af46c 100644
--- a/TAO/tests/OBV/Simple/Server_i.cpp
+++ b/TAO/tests/OBV/Simple/Server_i.cpp
@@ -46,8 +46,6 @@ Checkpoint_i::put_event (Event *event)
 {
   // Let us see what event has arrived
   event->do_print ();
-
-  return;
 }
 
 // Shutdown the server application.
@@ -62,15 +60,12 @@ Checkpoint_i::shutdown (void)
   this->orb_->shutdown ();
 }
 
-
 // Constructor.
-
 Checkpoint_i::Checkpoint_i (void)
 {
 }
 
 // Destructor.
-
 Checkpoint_i::~Checkpoint_i (void)
 {
 }
diff --git a/TAO/tests/OBV/Simple/Server_i.h b/TAO/tests/OBV/Simple/Server_i.h
index ae0b534a54b..c9ac63bb0ef 100644
--- a/TAO/tests/OBV/Simple/Server_i.h
+++ b/TAO/tests/OBV/Simple/Server_i.h
@@ -30,12 +30,9 @@ public:
   /// Destructor.
   ~Checkpoint_i (void);
 
-  virtual void put_event (
-        Event * e
-  );
+  virtual void put_event (Event * e);
 
-  virtual void shutdown (
-    );
+  virtual void shutdown (void);
 
   /// Set the ORB pointer.
   void orb (CORBA::ORB_ptr o);
diff --git a/TAO/tests/OBV/Simple/server.cpp b/TAO/tests/OBV/Simple/server.cpp
index 8cb92053d94..d2e2dec29d7 100644
--- a/TAO/tests/OBV/Simple/server.cpp
+++ b/TAO/tests/OBV/Simple/server.cpp
@@ -12,12 +12,9 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
   ACE_DEBUG ((LM_DEBUG,
               "\n\tCheckpoint Event_Types server\n\n"));
 
-
   try
     {
-      if (server.init ("Event_Types_Checkpoint",
-                       argc,
-                       argv) == -1)
+      if (server.init ("Event_Types_Checkpoint", argc, argv) == -1)
         return 1;
       else
         {