summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorzhangw <zhangw@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2006-04-10 16:27:40 +0000
committerzhangw <zhangw@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2006-04-10 16:27:40 +0000
commit69b15aa9e53f195f927d2d43ef9efc48dc27161c (patch)
tree19c1394d61404da3837299b27a7b8ef71b6d12f8
parentc8b0cd5f9f6313b54005d8afc16164af65c785e1 (diff)
downloadATCD-69b15aa9e53f195f927d2d43ef9efc48dc27161c.tar.gz
Mon Apr 10 16:21:40 UTC 2006 Wallace Zhang <zhangw@ociweb.com>
-rw-r--r--TAO/ChangeLog7
-rw-r--r--TAO/orbsvcs/examples/ImR/Advanced/TestServer.cpp2
2 files changed, 8 insertions, 1 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 7c91a7b0611..9e941032315 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,10 @@
+Mon Apr 10 16:21:40 UTC 2006 Wallace Zhang <zhangw@ociweb.com>
+
+ * orbsvcs/examples/ImR/Advanced/TestServer.cpp:
+
+ Trying to fix another compiler error in ICC 9.0 Windows
+ 64-bit build.
+
Mon Apr 10 14:50:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl>
* orbsvcs/tests/Bug_2377_Regression/Hello.cpp:
diff --git a/TAO/orbsvcs/examples/ImR/Advanced/TestServer.cpp b/TAO/orbsvcs/examples/ImR/Advanced/TestServer.cpp
index faa89a660cf..0b01378ccf8 100644
--- a/TAO/orbsvcs/examples/ImR/Advanced/TestServer.cpp
+++ b/TAO/orbsvcs/examples/ImR/Advanced/TestServer.cpp
@@ -506,7 +506,7 @@ void TestServer::buildObjects()
corbaloc += key;
// Write out corbaloc
- iorFile << corbaloc << endl;
+ iorFile << corbaloc.c_str() << endl;
}
}
}