*** empty log message ***

4 files changed, 13 insertions, 10 deletions

diff --git a/TAO/ChangeLog-98c b/TAO/ChangeLog-98c
index 722e7d45555..ff5fc68c495 100644
--- a/TAO/ChangeLog-98c
+++ b/TAO/ChangeLog-98c
@@ -1,5 +1,9 @@
 Sat Jun  6 17:35:59 1998  Douglas C. Schmidt  <schmidt@flamenco.cs.wustl.edu>
 
+	* TAO_IDL/be/be_visitor_interface.cpp: Added CORBA::Environment
+ 	  &env to the _default_POA() tie method.  Thanks to David Levine
+ 	  for reporting this.
+
 	* orbsvcs/orbsvcs/Log/Logger_i.cpp: Added a simple-minded
  	  implementation of the log() method.  This can certainly be
  	  improved...
diff --git a/TAO/TAO_IDL/be/be_visitor_interface.cpp b/TAO/TAO_IDL/be/be_visitor_interface.cpp
index bda9dadc60f..955c56937e6 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface.cpp
@@ -2094,7 +2094,7 @@ be_visitor_interface_tie_sh::visit_interface (be_interface *node)
       << "void _is_owner (CORBA::Boolean b);" << be_nl
       << "// set the ownership" << be_nl << be_nl
       << "// overridden ServantBase operations" << be_nl
-      << "PortableServer::POA_ptr _default_POA (void);\n";
+      << "PortableServer::POA_ptr _default_POA (CORBA::Environment &env);\n";
 
   // generate code for the operations in the scope
   if (this->visit_scope (node) ==  -1)
@@ -2250,7 +2250,7 @@ be_visitor_interface_tie_si::visit_interface (be_interface *node)
 
   *os << "template <class T> ACE_INLINE "
       << "PortableServer::POA_ptr" << be_nl
-      << fulltiename << "<T>::_default_POA (void)" << be_nl
+      << fulltiename << "<T>::_default_POA (CORBA::Environment &env)" << be_nl
       << "{" << be_idt_nl
       << "if (!CORBA::is_nil (this->poa_))" << be_idt_nl
       << "return this->poa_;" << be_uidt_nl
diff --git a/TAO/orbsvcs/orbsvcs/Log/Logger_i.cpp b/TAO/orbsvcs/orbsvcs/Log/Logger_i.cpp
index fd69744a911..b3794aed5f5 100644
--- a/TAO/orbsvcs/orbsvcs/Log/Logger_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/Logger_i.cpp
@@ -34,5 +34,5 @@ Logger_i::log (const char *message,
   // This is very simple-minded and can certainly be improved.
   ACE_DEBUG ((LM_DEBUG,
               "%s",
-              message);
+              message));
 }
diff --git a/TAO/tao/Servant_Base.h b/TAO/tao/Servant_Base.h
index 65d3a76ff07..f37484dd137 100644
--- a/TAO/tao/Servant_Base.h
+++ b/TAO/tao/Servant_Base.h
@@ -18,16 +18,17 @@
 #define SERVANT_BASE_H
 
 class TAO_Export TAO_ServantBase
+{
   // = TITLE
   //   Base class for skeletons and servants.
   //
   // = DESCRIPTION
   //   The POA spec requires that all servants inherit from this
   //   class.
-{
+public:
   friend class TAO_POA;
   friend class CORBA_Object;
-public:
+
   virtual ~TAO_ServantBase (void);
   // destructor
 
@@ -81,10 +82,9 @@ protected:
 };
 
 class TAO_Export TAO_Local_ServantBase : public TAO_ServantBase
+{
   // = TITLE
   //   Base class for local skeletons and servants.
-  //
-{
 protected:
   STUB_Object *_create_stub (CORBA_Environment &env);
   // This is an auxiliar method for _this().  Make sure *not* to
@@ -92,16 +92,15 @@ protected:
 };
 
 class TAO_Export TAO_DynamicImplementation : public virtual TAO_ServantBase
+{
   // = TITLE
   //   Base class for DSI.
   //
   // = DESCRIPTION
-
-  //   It is expected that the invoke() and _primary_interface()
+  //   It is expected that the <invoke> and <_primary_interface>
   //   methods will be only invoked by the POA in the context of
   //   serving a CORBA request. Invoking this method in other
   //   circumstances may lead to unpredictable results.
-{
 public:
   virtual void invoke (CORBA::ServerRequest_ptr request,
                        CORBA::Environment &env) = 0;