summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWilliam R. Otte <wotte@dre.vanderbilt.edu>2006-02-06 19:15:09 +0000
committerWilliam R. Otte <wotte@dre.vanderbilt.edu>2006-02-06 19:15:09 +0000
commit2937ca2b236b5e0269e238de0b8d0728b16ca587 (patch)
treeb7e6c10fc38b4031e11a20cac1e25bc61e6351db
parentcd3d90765816ed4652f2bb6fcc5dd45c7ce5dfeb (diff)
downloadATCD-2937ca2b236b5e0269e238de0b8d0728b16ca587.tar.gz
Mon Feb 6 19:13:13 UTC 2006 William Otte <wotte@dre.vanderbilt.edu>
-rw-r--r--TAO/CIAO/ChangeLog11
-rw-r--r--TAO/CIAO/DAnCE/NodeApplicationManager/NodeApplicationManager.mpc1
-rw-r--r--TAO/CIAO/performance-tests/Benchmark/Benchmark.mpc2
3 files changed, 14 insertions, 0 deletions
diff --git a/TAO/CIAO/ChangeLog b/TAO/CIAO/ChangeLog
index 0fa04f211b0..0e03b76ed6f 100644
--- a/TAO/CIAO/ChangeLog
+++ b/TAO/CIAO/ChangeLog
@@ -1,3 +1,14 @@
+Mon Feb 6 19:13:13 UTC 2006 William Otte <wotte@dre.vanderbilt.edu>
+
+ * DAnCE/NodeApplicationManager/NodeApplicationManager.mpc
+
+ Fixed an export problem manifesting in VC8.
+
+ * performance-tests/Benchmark/Benchmark.mpc
+
+ Added an empty IDL_Files section to the servant to prevent
+ nmake from regenerating from the IDL file.
+
Mon Feb 6 13:54:39 UTC 2006 Ossama Othman <ossama_othman at symantec dot com>
* ciao/ComponentsC.h:
diff --git a/TAO/CIAO/DAnCE/NodeApplicationManager/NodeApplicationManager.mpc b/TAO/CIAO/DAnCE/NodeApplicationManager/NodeApplicationManager.mpc
index 1fe22497208..4f4e2e6478a 100644
--- a/TAO/CIAO/DAnCE/NodeApplicationManager/NodeApplicationManager.mpc
+++ b/TAO/CIAO/DAnCE/NodeApplicationManager/NodeApplicationManager.mpc
@@ -7,6 +7,7 @@ project(NodeApplicationManager): ciao_component_dnc, ciao_deployment_svnt, dance
after += NodeManager_stub CIAO_TargetManager_stub
idlflags += -Wb,export_include=CIAO_NAM_Export.h -Wb,export_macro=CIAO_NAM_Export
dynamicflags = CIAO_NAM_BUILD_DLL
+ dynamicflags += NOOP_CONFIGURATOR_BUILD_DLL
// @@TODO: This ../NodeApplication business need to go. It would be better
// to factor that stuff into a separate lib, ie. NodeApplication_Impl
diff --git a/TAO/CIAO/performance-tests/Benchmark/Benchmark.mpc b/TAO/CIAO/performance-tests/Benchmark/Benchmark.mpc
index 9b324135836..32f12acaa2e 100644
--- a/TAO/CIAO/performance-tests/Benchmark/Benchmark.mpc
+++ b/TAO/CIAO/performance-tests/Benchmark/Benchmark.mpc
@@ -22,6 +22,8 @@ project(Benchmark_svnt) : ciao_component_dnc {
idlflags += -Wb,export_macro=BENCHMARK_SVNT_Export -Wb,export_include=Benchmark_svnt_export.h
dynamicflags = BENCHMARK_SVNT_BUILD_DLL
+ IDL_Files {
+ }
Source_Files {
BenchmarkS.cpp