summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOssama Othman <ossama-othman@users.noreply.github.com>2003-09-02 20:47:13 +0000
committerOssama Othman <ossama-othman@users.noreply.github.com>2003-09-02 20:47:13 +0000
commit2ca8a178484c364ecb426547fa09fb8464422f71 (patch)
treef4e5f3d4a5f38fd2adf4284db8cdb00a389173d7
parenteaeb03ee443aaa1b854e6196892ec1f0a7372dd1 (diff)
downloadATCD-2ca8a178484c364ecb426547fa09fb8464422f71.tar.gz
ChangeLogTag:Tue Sep 2 13:38:37 2003 Ossama Othman <ossama@dre.vanderbilt.edu>
-rw-r--r--TAO/ChangeLog8
-rw-r--r--TAO/TAOACE_Static.dsw15
2 files changed, 8 insertions, 15 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index a9696da3afa..239daec40e9 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,11 @@
+Tue Sep 2 13:38:37 2003 Ossama Othman <ossama@dre.vanderbilt.edu>
+
+ * TAOACE_Static.dsw:
+
+ Fixed incorrect inter-project dependencies for PortableServer,
+ ObjRefTemplate, and IORInterceptor projects. Fixes "duplicate
+ definition" link-time errors.
+
Tue Sep 2 07:20:13 2003 Chad Elliott <elliott_c@ociweb.com>
* TAO_IDL/tao_idl.mpc:
diff --git a/TAO/TAOACE_Static.dsw b/TAO/TAOACE_Static.dsw
index 17d7f0fe4f9..7e28d493745 100644
--- a/TAO/TAOACE_Static.dsw
+++ b/TAO/TAOACE_Static.dsw
@@ -317,9 +317,6 @@ Package=<4>
Begin Project Dependency
Project_Dep_Name ObjRefTemplate_Static
End Project Dependency
- Begin Project Dependency
- Project_Dep_Name TAO LIB
- End Project Dependency
}}}
###############################################################################
@@ -462,9 +459,6 @@ Package=<5>
Package=<4>
{{{
Begin Project Dependency
- Project_Dep_Name TAO LIB
- End Project Dependency
- Begin Project Dependency
Project_Dep_Name Valuetype_Static
End Project Dependency
}}}
@@ -495,17 +489,8 @@ Package=<5>
Package=<4>
{{{
Begin Project Dependency
- Project_Dep_Name TAO LIB
- End Project Dependency
- Begin Project Dependency
Project_Dep_Name IORInterceptor_Static
End Project Dependency
- Begin Project Dependency
- Project_Dep_Name ObjRefTemplate_Static
- End Project Dependency
- Begin Project Dependency
- Project_Dep_Name Valuetype_Static
- End Project Dependency
}}}
###############################################################################