summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorparsons <parsons@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2005-11-16 14:54:47 +0000
committerparsons <parsons@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2005-11-16 14:54:47 +0000
commitee1bf1b357cb8fdfc9652ad2efe41054ebe329a0 (patch)
treea3409c022ffcc9d924bf9106fd0861b960b3ad00
parent846285aa71f47443bfbfe04f887740ed9cd6294c (diff)
downloadATCD-ee1bf1b357cb8fdfc9652ad2efe41054ebe329a0.tar.gz
ChangeLogTag: Wed Nov 16 14:52:32 UTC 2005 Jeff Parsons <j.parsons@vanderbilt.edu>
-rw-r--r--TAO/ChangeLog7
-rw-r--r--TAO/tests/NestedUpcall/Simple/Simple.mpc5
2 files changed, 10 insertions, 2 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 43ba96108ed..540245addd0 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,10 @@
+Wed Nov 16 14:52:32 UTC 2005 Jeff Parsons <j.parsons@vanderbilt.edu>
+
+ * tests/NestedUpcall/Simple/Simple.mpc:
+
+ Added 'after' line to one of the two projects in the MPC file,
+ so VC8 doesn't execute the IDL compiler concurrently.
+
Tue Nov 15 23:48:47 2005 Ossama Othman <ossama@dre.vanderbilt.edu>
* orbsvcs/orbsvcs/Makefile.am:
diff --git a/TAO/tests/NestedUpcall/Simple/Simple.mpc b/TAO/tests/NestedUpcall/Simple/Simple.mpc
index c809e1301ee..766f62db832 100644
--- a/TAO/tests/NestedUpcall/Simple/Simple.mpc
+++ b/TAO/tests/NestedUpcall/Simple/Simple.mpc
@@ -1,14 +1,15 @@
// -*- MPC -*-
// $Id$
-project(*Nested Upcall Server): taoexe, portableserver {
+project(*Nested_Upcall_Server): taoexe, portableserver {
Source_Files {
server_i.cpp
server.cpp
}
}
-project(*Nested Upcall Client): taoexe, portableserver {
+project(*Nested_Upcall_Client): taoexe, portableserver {
+ after += *Nested_Upcall_Server
Source_Files {
client_i.cpp
client.cpp