ChangeLogTag:Mon Feb 8 13:43:10 1999 Carlos O'Ryan <coryan@cs.wustl.edu>

1 files changed, 29 insertions, 13 deletions

diff --git a/TAO/tao/skip.cpp b/TAO/tao/skip.cpp
index d4327f78cce..0b46dda1867 100644
--- a/TAO/tao/skip.cpp
+++ b/TAO/tao/skip.cpp
@@ -19,7 +19,11 @@
 //
 // ============================================================================
 
-#include "tao/corba.h"
+#include "tao/Marshal.h"
+#include "tao/CDR.h"
+#include "tao/GIOP.h"
+#include "tao/Any.h"
+#include "tao/Environment.h"
 
 ACE_RCSID(tao, skip, "$Id$")
 
@@ -78,7 +82,8 @@ TAO_Marshal_Primitive::skip (CORBA::TypeCode_ptr  tc,
   else
     {
       env.exception (new CORBA::MARSHAL (CORBA::COMPLETED_MAYBE));
-      dmsg ("TAO_Marshal_Primitive::skip detected error");
+      ACE_DEBUG ((LM_DEBUG,
+                  "TAO_Marshal_Primitive::skip detected error"));
       return CORBA::TypeCode::TRAVERSE_STOP;
     }
 }
@@ -191,7 +196,8 @@ TAO_Marshal_TypeCode::skip (CORBA::TypeCode_ptr,
       else // bad kind_ value to be decoded
         {
           env.exception (new CORBA::BAD_TYPECODE (CORBA::COMPLETED_NO));
-          dmsg ("TAO_Marshal_TypeCode: Bad kind_ value in CDR stream");
+          ACE_DEBUG ((LM_DEBUG,
+                      "TAO_Marshal_TypeCode: Bad kind_ value in CDR stream"));
           return CORBA::TypeCode::TRAVERSE_STOP;
         }
     }
@@ -201,7 +207,8 @@ TAO_Marshal_TypeCode::skip (CORBA::TypeCode_ptr,
   else
     {
       env.exception (new CORBA::MARSHAL (CORBA::COMPLETED_MAYBE));
-      dmsg ("TAO_Marshal_TypeCode::skip detected error");
+      ACE_DEBUG ((LM_DEBUG,
+                  "TAO_Marshal_TypeCode::skip detected error"));
       return CORBA::TypeCode::TRAVERSE_STOP;
     }
 }
@@ -232,7 +239,8 @@ TAO_Marshal_Principal::skip (CORBA::TypeCode_ptr,
   else
     {
       env.exception (new CORBA::MARSHAL (CORBA::COMPLETED_MAYBE));
-      dmsg ("TAO_Marshal_Principal::skip detected error");
+      ACE_DEBUG ((LM_DEBUG,
+                  "TAO_Marshal_Principal::skip detected error"));
       return CORBA::TypeCode::TRAVERSE_STOP;
     }
 }
@@ -316,7 +324,8 @@ TAO_Marshal_ObjRef::skip (CORBA::TypeCode_ptr,
             || !str.skip_ushort ())
           {
             env.exception (new CORBA::MARSHAL (CORBA::COMPLETED_MAYBE));
-            dmsg ("error decoding IIOP host/port");
+            ACE_DEBUG ((LM_DEBUG,
+                        "error decoding IIOP host/port"));
             return CORBA::TypeCode::TRAVERSE_STOP;
           }
 
@@ -375,7 +384,8 @@ TAO_Marshal_Struct::skip (CORBA::TypeCode_ptr  tc,
   else
     {
       env.exception (new CORBA::MARSHAL (CORBA::COMPLETED_MAYBE));
-      dmsg ("marshaling encode_struct detected error");
+      ACE_DEBUG ((LM_DEBUG,
+                  "marshaling encode_struct detected error"));
       return CORBA::TypeCode::TRAVERSE_STOP;
     }
 }
@@ -586,7 +596,8 @@ TAO_Marshal_String::skip (CORBA::TypeCode_ptr,
   else
     {
       env.exception (new CORBA::MARSHAL (CORBA::COMPLETED_MAYBE));
-      dmsg ("TAO_Marshal_TypeCode::skip detected error");
+      ACE_DEBUG ((LM_DEBUG,
+                  "TAO_Marshal_TypeCode::skip detected error"));
       return CORBA::TypeCode::TRAVERSE_STOP;
     }
 }
@@ -634,7 +645,8 @@ TAO_Marshal_Sequence::skip (CORBA::TypeCode_ptr  tc,
     }
   // error exit
   env.exception (new CORBA::MARSHAL (CORBA::COMPLETED_NO));
-  dmsg ("marshaling TAO_Marshal_Sequence::skip detected error");
+  ACE_DEBUG ((LM_DEBUG,
+              "marshaling TAO_Marshal_Sequence::skip detected error"));
   return CORBA::TypeCode::TRAVERSE_STOP;
 }
 
@@ -671,7 +683,8 @@ TAO_Marshal_Array::skip (CORBA::TypeCode_ptr  tc,
     } // no exception computing bounds
   // error exit
   env.exception (new CORBA::MARSHAL (CORBA::COMPLETED_NO));
-  dmsg ("marshaling TAO_Marshal_Sequence::skip detected error");
+  ACE_DEBUG ((LM_DEBUG,
+              "marshaling TAO_Marshal_Sequence::skip detected error"));
   return CORBA::TypeCode::TRAVERSE_STOP;
 }
 
@@ -704,7 +717,8 @@ TAO_Marshal_Alias::skip (CORBA::TypeCode_ptr  tc,
   else
     {
       env.exception (new CORBA::MARSHAL (CORBA::COMPLETED_MAYBE));
-      dmsg ("TAO_Marshal_Alias::skip detected error");
+      ACE_DEBUG ((LM_DEBUG,
+                  "TAO_Marshal_Alias::skip detected error"));
       return CORBA::TypeCode::TRAVERSE_STOP;
     }
 }
@@ -755,7 +769,8 @@ TAO_Marshal_Except::skip (CORBA::TypeCode_ptr  tc,
   else
     {
       env.exception (new CORBA::MARSHAL (CORBA::COMPLETED_MAYBE));
-      dmsg ("TAO_Marshal_Except detected error");
+      ACE_DEBUG ((LM_DEBUG,
+                  "TAO_Marshal_Except detected error"));
       return CORBA::TypeCode::TRAVERSE_STOP;
     }
 }
@@ -791,7 +806,8 @@ TAO_Marshal_WString::skip (CORBA::TypeCode_ptr,
   else
     {
       env.exception (new CORBA::MARSHAL (CORBA::COMPLETED_MAYBE));
-      dmsg ("TAO_Marshal_TypeCode::skip detected error");
+      ACE_DEBUG ((LM_DEBUG,
+                  "TAO_Marshal_TypeCode::skip detected error"));
       return CORBA::TypeCode::TRAVERSE_STOP;
     }
 }