summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorcoryan <coryan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>1999-07-16 21:20:46 +0000
committercoryan <coryan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>1999-07-16 21:20:46 +0000
commita34587420678f87c07ab78c2cb80de62c1a39b54 (patch)
treeaaa0f3ec7712c1ba9a46823f911b6c19a9f4767b
parentb3f6ff7b5e8b89f54fd2d75e7707602cad2cf21d (diff)
downloadATCD-a34587420678f87c07ab78c2cb80de62c1a39b54.tar.gz
ChangeLogTag:Fri Jul 16 15:51:38 1999 Carlos O'Ryan <coryan@cs.wustl.edu>
-rw-r--r--TAO/ChangeLog-99c9
-rwxr-xr-xTAO/examples/Simple/echo/run_test.pl2
-rw-r--r--TAO/tao/IIOP_Profile.cpp2
3 files changed, 11 insertions, 2 deletions
diff --git a/TAO/ChangeLog-99c b/TAO/ChangeLog-99c
index 1e7fdd6ff0f..396e526dae0 100644
--- a/TAO/ChangeLog-99c
+++ b/TAO/ChangeLog-99c
@@ -1,3 +1,12 @@
+Fri Jul 16 15:51:38 1999 Carlos O'Ryan <coryan@cs.wustl.edu>
+
+ * tao/IIOP_Profile.cpp:
+ Fixed warning under egcs-2.95
+
+ * examples/Simple/echo/run_test.pl:
+ Added $EXEPREFIX thanks to Russell L. Carter
+ <rcarter@consys.com> for pointing this out
+
Fri Jul 16 15:16:14 1999 Carlos O'Ryan <coryan@cs.wustl.edu>
* */Makefile:
diff --git a/TAO/examples/Simple/echo/run_test.pl b/TAO/examples/Simple/echo/run_test.pl
index d5853ba10b8..3be6c7823be 100755
--- a/TAO/examples/Simple/echo/run_test.pl
+++ b/TAO/examples/Simple/echo/run_test.pl
@@ -12,7 +12,7 @@ require Process;
$status = 0;
$iorfile = "echo.ior";
-$SV = Process::Create ("server$EXE_EXT", "-o $iorfile ");
+$SV = Process::Create ($EXEPREFIX."server$EXE_EXT", "-o $iorfile ");
if (ACE::waitforfile_timed ($iorfile, 15) == -1) {
print STDERR "ERROR: timedout waiting for file <$iorfile>\n";
$SV->Kill (); $SV->TimedWait (1);
diff --git a/TAO/tao/IIOP_Profile.cpp b/TAO/tao/IIOP_Profile.cpp
index 9a721c2528e..5e5d7d90de2 100644
--- a/TAO/tao/IIOP_Profile.cpp
+++ b/TAO/tao/IIOP_Profile.cpp
@@ -408,7 +408,7 @@ TAO_IIOP_Profile::to_string (CORBA::Environment &)
1 /* colon separator */ +
5 /* port number */ +
1 /* object key separator */ +
- ACE_OS::strlen (key));
+ ACE_OS::strlen (key.in ()));
CORBA::String buf = CORBA::string_alloc (buflen);