summaryrefslogtreecommitdiff
path: root/TAO/tao
diff options
context:
space:
mode:
Diffstat (limited to 'TAO/tao')
-rw-r--r--TAO/tao/GIOP_Message_Base.cpp5
-rw-r--r--TAO/tao/GIOP_Message_Generator_Parser.inl2
-rw-r--r--TAO/tao/GIOP_Message_Generator_Parser_12.inl2
-rw-r--r--TAO/tao/GIOP_Message_Lite.cpp4
4 files changed, 3 insertions, 10 deletions
diff --git a/TAO/tao/GIOP_Message_Base.cpp b/TAO/tao/GIOP_Message_Base.cpp
index 17f0ec30437..44b45076d9e 100644
--- a/TAO/tao/GIOP_Message_Base.cpp
+++ b/TAO/tao/GIOP_Message_Base.cpp
@@ -374,11 +374,10 @@ TAO_GIOP_Message_Base::message_type (void)
ACE_ERROR ((LM_ERROR,
ACE_TEXT ("TAO (%P|%t) %N:%l message_type : ")
ACE_TEXT ("wrong message.\n")));
- return TAO_PLUGGABLE_MESSAGE_MESSAGERROR;
+
}
- // In case of some errors
return TAO_PLUGGABLE_MESSAGE_MESSAGERROR;
}
@@ -436,8 +435,6 @@ TAO_GIOP_Message_Base::process_request_message (TAO_Transport *transport,
default:
return -1;
}
-
- return -1;
}
int
diff --git a/TAO/tao/GIOP_Message_Generator_Parser.inl b/TAO/tao/GIOP_Message_Generator_Parser.inl
index 18ebe00d5af..ca0908bbcf6 100644
--- a/TAO/tao/GIOP_Message_Generator_Parser.inl
+++ b/TAO/tao/GIOP_Message_Generator_Parser.inl
@@ -1 +1 @@
-//$Id$ \ No newline at end of file
+//$Id$
diff --git a/TAO/tao/GIOP_Message_Generator_Parser_12.inl b/TAO/tao/GIOP_Message_Generator_Parser_12.inl
index 18ebe00d5af..ca0908bbcf6 100644
--- a/TAO/tao/GIOP_Message_Generator_Parser_12.inl
+++ b/TAO/tao/GIOP_Message_Generator_Parser_12.inl
@@ -1 +1 @@
-//$Id$ \ No newline at end of file
+//$Id$
diff --git a/TAO/tao/GIOP_Message_Lite.cpp b/TAO/tao/GIOP_Message_Lite.cpp
index 52f25f125ef..a6ab743e9a2 100644
--- a/TAO/tao/GIOP_Message_Lite.cpp
+++ b/TAO/tao/GIOP_Message_Lite.cpp
@@ -379,8 +379,6 @@ TAO_GIOP_Message_Lite::message_type (void)
ACE_ERROR ((LM_ERROR,
ACE_TEXT ("TAO (%P|%t) %N:%l message_type : ")
ACE_TEXT ("wrong message.\n")));
- return TAO_PLUGGABLE_MESSAGE_MESSAGERROR;
-
}
// In case of some errors
@@ -439,8 +437,6 @@ TAO_GIOP_Message_Lite::process_request_message (TAO_Transport *transport,
default:
return -1;
}
-
- return -1;
}
int