summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbala <balanatarajan@users.noreply.github.com>2000-03-16 21:29:14 +0000
committerbala <balanatarajan@users.noreply.github.com>2000-03-16 21:29:14 +0000
commitdca06fd00118d0125d1768904e90b5fa7ec8f6cb (patch)
tree87c102b293f3f68c466e76bde66aeea57ce0ad2c
parent891706bda7d842938e09c93b1af80dd03ab327ab (diff)
downloadATCD-dca06fd00118d0125d1768904e90b5fa7ec8f6cb.tar.gz
ChangeLogTag: Thu Mar 16 15:26:30 2000 Balachandran Natarajan <bala@cs.wustl.edu>
-rw-r--r--TAO/ChangeLogs/ChangeLog-02a8
-rw-r--r--TAO/tao/GIOP_Message_Acceptors.cpp4
-rw-r--r--TAO/tao/GIOP_Message_Connectors.cpp1
-rw-r--r--TAO/tao/GIOP_Message_Lite.cpp1
4 files changed, 10 insertions, 4 deletions
diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a
index 5a4d7c41b00..e278cb507ce 100644
--- a/TAO/ChangeLogs/ChangeLog-02a
+++ b/TAO/ChangeLogs/ChangeLog-02a
@@ -1,3 +1,11 @@
+Thu Mar 16 15:26:30 2000 Balachandran Natarajan <bala@cs.wustl.edu>
+
+ * tao/GIOP_Message_Lite.cpp (parse_reply):
+ * tao/GIOP_Message_Acceptors.cpp:
+ * tao/GIOP_Message_Connectors.cpp: More warning fixes. These were
+ in Digital Unix. Thanks to Jeff Parsons <parsons@cs.wustl.edu>
+ for reporting this.
+
Thu Mar 16 13:22:02 2000 Ossama Othman <ossama@uci.edu>
* tao/IIOP_Acceptor.cpp (open_default):
diff --git a/TAO/tao/GIOP_Message_Acceptors.cpp b/TAO/tao/GIOP_Message_Acceptors.cpp
index 7a41d9a3944..3736fbb9c25 100644
--- a/TAO/tao/GIOP_Message_Acceptors.cpp
+++ b/TAO/tao/GIOP_Message_Acceptors.cpp
@@ -537,13 +537,13 @@ TAO_GIOP_Message_Acceptors::
}
-ACE_INLINE CORBA::Octet
+CORBA::Octet
TAO_GIOP_Message_Acceptors::major_version (void)
{
return this->accept_state_->major_version ();
}
-ACE_INLINE CORBA::Octet
+CORBA::Octet
TAO_GIOP_Message_Acceptors::minor_version (void)
{
return this->accept_state_->minor_version ();
diff --git a/TAO/tao/GIOP_Message_Connectors.cpp b/TAO/tao/GIOP_Message_Connectors.cpp
index 9689e86ba85..4361406d2ae 100644
--- a/TAO/tao/GIOP_Message_Connectors.cpp
+++ b/TAO/tao/GIOP_Message_Connectors.cpp
@@ -241,7 +241,6 @@ TAO_GIOP_Message_Connector_11::
ASYS_TEXT ("TAO (%P|%t) %N:%l parse_reply: ")
ASYS_TEXT ("wrong message.\n")),
-1);
- break;
case TAO_GIOP_LOCATEREPLY:
// Handle after the switch
break;
diff --git a/TAO/tao/GIOP_Message_Lite.cpp b/TAO/tao/GIOP_Message_Lite.cpp
index ea0a303e728..5679d4fda20 100644
--- a/TAO/tao/GIOP_Message_Lite.cpp
+++ b/TAO/tao/GIOP_Message_Lite.cpp
@@ -301,7 +301,6 @@ TAO_GIOP_Message_Lite::
ASYS_TEXT ("TAO (%P|%t) %N:%l parse_reply: ")
ASYS_TEXT ("wrong message.\n")),
-1);
- break;
case TAO_GIOP_LOCATEREPLY:
// Handle after the switch
break;