summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon McQueen <simon.mcqueen@gmail.com>2005-11-24 19:14:38 +0000
committerSimon McQueen <simon.mcqueen@gmail.com>2005-11-24 19:14:38 +0000
commit44d5bd414b45fc00e1a85d9e33c5c44a954f87c6 (patch)
tree993a40c46a32e6d993cb9e6c200892a730a9264c
parent73af2317fb088eba018f46a672952d2c1fe04d46 (diff)
downloadATCD-44d5bd414b45fc00e1a85d9e33c5c44a954f87c6.tar.gz
ChangeLogTag: Thu Nov 24 19:07:56 2005 Simon McQueen <sm@prismtech.com>
-rw-r--r--TAO/ChangeLog11
-rw-r--r--TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connector.cpp2
2 files changed, 10 insertions, 3 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 14262931ef8..bbbeeb069f1 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,7 +1,14 @@
+Thu Nov 24 19:07:56 2005 Simon McQueen <sm@prismtech.com>
+
+ * orbsvcs/orbsvcs/PortableGroup/UIPMC_Connector.cpp:
+
+ Fix calculation of protocol name length. This fixes the
+ failure in orbsvcs/tests/Miop/McastHello.
+
Thu Nov 24 15:56:31 UTC 2005 Jeff Parsons <j.parsons@vanderbilt.edu>
* tests/Bug_1670_Regression/Bug_1670_Regression.mpc:
-
+
Added 'after' line in one project to avoid concurrently
clashes in VC8 builds, since the two projects share an
IDL file.
@@ -234,7 +241,7 @@ Wed Nov 23 22:24:38 2005 Chris Cleeland <cleeland_c@ociweb.com>
This change should eliminate warnings from Windows-based
compilers (e.g., VC8) about calling delete through a pointer to
an incomplete type while instantiating ACE_Auto_Ptr<> methods.
-
+
* orbsvcs/orbsvcs/Notify/Object.h:
* orbsvcs/orbsvcs/Notify/Object.cpp:
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connector.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connector.cpp
index d6d74ed8e6c..2bd9ffc58fd 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connector.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connector.cpp
@@ -182,7 +182,7 @@ TAO_UIPMC_Connector::check_prefix (const char *endpoint)
return -1; // Failure
static const char protocol[] = "miop";
- static size_t const len = sizeof (protocol);
+ static size_t const len = sizeof (protocol) - 1;
size_t const slot = ACE_OS::strchr (endpoint, ':') - endpoint;