summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordengg <dengg@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2005-03-03 15:01:20 +0000
committerdengg <dengg@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2005-03-03 15:01:20 +0000
commit4bafa1868b842aebe26fcb24e21ff20766bfc55c (patch)
tree7358ac06ca21f60acc6fd7928cb38b78b31136d2
parentb32b0f3b5068910b2fc271112ef71677e9e18d73 (diff)
downloadATCD-4bafa1868b842aebe26fcb24e21ff20766bfc55c.tar.gz
Mon Mar 03 08:59:23 2005 Gan Deng <gan.deng@vanderbilt.edu>
-rw-r--r--TAO/CIAO/ChangeLog7
-rw-r--r--TAO/CIAO/DAnCE/examples/Hello/Hello_Base/Hello_Base.mpc12
2 files changed, 10 insertions, 9 deletions
diff --git a/TAO/CIAO/ChangeLog b/TAO/CIAO/ChangeLog
index 5736efcc4a4..56f0928730c 100644
--- a/TAO/CIAO/ChangeLog
+++ b/TAO/CIAO/ChangeLog
@@ -1,3 +1,10 @@
+Mon Mar 03 08:59:23 2005 Gan Deng <gan.deng@vanderbilt.edu>
+
+ * DAnCE/examples/Hello/Hello_Base/Hello_Base.mpc
+
+ Fixed the Hello_Base_DnC_svnt project settings which
+ caused comilation errors.
+
Wed Mar 02 11:42:12 UTC 2005 Johnny Willemsen <jwillemsen@remedy.nl>
* DAnCE/Config_Handlers/Config_Handlers.mpc
diff --git a/TAO/CIAO/DAnCE/examples/Hello/Hello_Base/Hello_Base.mpc b/TAO/CIAO/DAnCE/examples/Hello/Hello_Base/Hello_Base.mpc
index c2d0c37e844..90cb900cea5 100644
--- a/TAO/CIAO/DAnCE/examples/Hello/Hello_Base/Hello_Base.mpc
+++ b/TAO/CIAO/DAnCE/examples/Hello/Hello_Base/Hello_Base.mpc
@@ -17,25 +17,19 @@ project(Hello_Base_DnC_stub): ciao_client_dnc {
}
project(Hello_Base_DnC_svnt) : ciao_servant_dnc {
- after += Hello_Base_stub
+ after += Hello_Base_DnC_stub
sharedname = Hello_Base_svnt
libs += Hello_Base_stub
- idlflags += -Wb,export_macro=HELLO_BASE_SVNT_Export -Wb,export_include=Hello_Base_svnt_export.h
+ idlflags += -Wb,stub_export_macro=HELLO_BASE_STUB_Export -Wb,stub_export_include=Hello_Base_stub_export.h -Wb,skel_export_macro=HELLO_BASE_SVNT_Export -Wb,skel_export_include=Hello_Base_svnt_export.h
dynamicflags = HELLO_BASE_SVNT_BUILD_DLL
- CIDL_Files {
- Hello_Base.cidl
- }
-
IDL_Files {
- Hello_BaseE.idl
+ Hello_Base.idl
}
Source_Files {
- Hello_BaseEC.cpp
Hello_BaseS.cpp
- Hello_Base_svnt.cpp
}
}