1 files changed, 6 insertions, 7 deletions
diff --git a/TAO/tests/POA/DSI/Database_i.h b/TAO/tests/POA/DSI/Database_i.h
index b9655f16600..309adea7bbd 100644
--- a/TAO/tests/POA/DSI/Database_i.h
+++ b/TAO/tests/POA/DSI/Database_i.h
@@ -101,10 +101,9 @@ public:
   class Employee
   {
   public:
-    Employee (const char* name,
-              CORBA::Long id);
+    Employee (const char* name, CORBA::Long id);
 
-    ~Employee (void);
+    ~Employee ();
 
     const char *name () const;
     void name (const char* name);
@@ -113,16 +112,16 @@ public:
     void id (CORBA::Long id);
 
     /// Overloaded new operator, nothrow_t variant.
-    void *operator new (size_t bytes, const ACE_nothrow_t &nt);
-    void operator delete (void *p, const ACE_nothrow_t&) throw ();
+    void *operator new (size_t bytes, const std::nothrow_t &nt);
+    void operator delete (void *p, const std::nothrow_t&) throw ();
     void *operator new (size_t);
     void operator delete (void *pointer);
 
   private:
-    CORBA::Long id_;
     // Employee ID.
+    CORBA::Long id_;
 
-    char *name_;
     // Employee name.
+    char *name_;
   };
 };