ChangeLogTag:Sat Oct 9 23:43:52 2004 Balachandran Natarajan <bala@dre.vanderbilt.edu>

9 files changed, 97 insertions, 28 deletions

diff --git a/TAO/CIAO/examples/OEP/BasicSP/BMClosedED/BMClosedED.mpc b/TAO/CIAO/examples/OEP/BasicSP/BMClosedED/BMClosedED.mpc
index dd6587e30bb..3a34534e512 100644
--- a/TAO/CIAO/examples/OEP/BasicSP/BMClosedED/BMClosedED.mpc
+++ b/TAO/CIAO/examples/OEP/BasicSP/BMClosedED/BMClosedED.mpc
@@ -5,9 +5,16 @@
 project(BMClosedED_stub): ciao_client {
   after += BasicSP_stub
   sharedname = BMClosedED_stub
-  idlflags += -Wb,stub_export_macro=BMCLOSEDED_STUB_Export -Wb,stub_export_include=BMClosedED_stub_export.h -Wb,skel_export_macro=BMCLOSEDED_SVNT_Export -Wb,skel_export_include=BMClosedED_svnt_export.h
+   
+  idlflags += -Wb,stub_export_macro=BMCLOSEDED_STUB_Export 
+  idlflags += -Wb,stub_export_include=BMClosedED_stub_export.h 
+  idlflags += -Wb,skel_export_macro=BMCLOSEDED_SVNT_Export 
+  idlflags += -Wb,skel_export_include=BMClosedED_svnt_export.h
+
   dynamicflags   = BMCLOSEDED_STUB_BUILD_DLL
 
+  libs += BasicSP_stub
+
   IDL_Files {
     BMClosedED.idl
   }
diff --git a/TAO/CIAO/examples/OEP/BasicSP/BMDevice/BMDevice.mpc b/TAO/CIAO/examples/OEP/BasicSP/BMDevice/BMDevice.mpc
index 2c618860cb9..af2e66ae3a6 100644
--- a/TAO/CIAO/examples/OEP/BasicSP/BMDevice/BMDevice.mpc
+++ b/TAO/CIAO/examples/OEP/BasicSP/BMDevice/BMDevice.mpc
@@ -2,9 +2,16 @@
 
 project(BMDevice_stub): ciao_client {
   after += BasicSP_stub
+
   sharedname = BMDevice_stub
 
-  idlflags += -Wb,stub_export_macro=BMDEVICE_STUB_Export -Wb,stub_export_include=BMDevice_stub_export.h -Wb,skel_export_macro=BMDEVICE_SVNT_Export -Wb,skel_export_include=BMDevice_svnt_export.h
+  libs += BasicSP_stub
+
+  idlflags += -Wb,stub_export_macro=BMDEVICE_STUB_Export 
+  idlflags += -Wb,stub_export_include=BMDevice_stub_export.h 
+  idlflags += -Wb,skel_export_macro=BMDEVICE_SVNT_Export 
+  idlflags += -Wb,skel_export_include=BMDevice_svnt_export.h
+
   libpaths += ..
   libs += BasicSP_stub
   dynamicflags   = BMDEVICE_STUB_BUILD_DLL
@@ -21,9 +28,13 @@ project(BMDevice_stub): ciao_client {
 project(BMDevice_svnt) : ciao_servant {
   after += BMDevice_stub BasicSP_stub
   sharedname  = BMDevice_svnt
+
   libs    += BMDevice_stub BasicSP_stub BasicSP_svnt
+
   libpaths += ..
-  idlflags  +=  -Wb,export_macro=BMDEVICE_SVNT_Export -Wb,export_include=BMDevice_svnt_export.h
+
+  idlflags  +=  -Wb,export_macro=BMDEVICE_SVNT_Export 
+  idlflags += -Wb,export_include=BMDevice_svnt_export.h
   dynamicflags = BMDEVICE_SVNT_BUILD_DLL
 
   CIDL_Files {
@@ -46,8 +57,9 @@ project(BMDevice_exec) : ciao_component {
   after += BMDevice_svnt
   sharedname = BMDevice_exec
   libs      += BMDevice_stub BMDevice_svnt BasicSP_stub BasicSP_svnt
-  libpaths += ..
-  idlflags  +=  -Wb,export_macro=BMDEVICE_EXEC_Export -Wb,export_include=BMDevice_exec_export.h
+  libpaths  += ..
+  idlflags  +=  -Wb,export_macro=BMDEVICE_EXEC_Export 
+  idlflags  += -Wb,export_include=BMDevice_exec_export.h
   dynamicflags   = BMDEVICE_EXEC_BUILD_DLL
 
   IDL_Files {
diff --git a/TAO/CIAO/examples/OEP/BasicSP/BMDisplay/BMDisplay.mpc b/TAO/CIAO/examples/OEP/BasicSP/BMDisplay/BMDisplay.mpc
index 5c0a113b9c8..6888a4a3635 100644
--- a/TAO/CIAO/examples/OEP/BasicSP/BMDisplay/BMDisplay.mpc
+++ b/TAO/CIAO/examples/OEP/BasicSP/BMDisplay/BMDisplay.mpc
@@ -3,8 +3,16 @@
 
 project(BMDisplay_stub): ciao_client {
   after += BasicSP_stub
+  
   sharedname = BMDisplay_stub
-  idlflags += -Wb,stub_export_macro=BMDISPLAY_STUB_Export -Wb,stub_export_include=BMDisplay_stub_export.h -Wb,skel_export_macro=BMDISPLAY_SVNT_Export -Wb,skel_export_include=BMDisplay_svnt_export.h
+
+  idlflags += -Wb,stub_export_macro=BMDISPLAY_STUB_Export 
+  idlflags += -Wb,stub_export_include=BMDisplay_stub_export.h 
+  idlflags += -Wb,skel_export_macro=BMDISPLAY_SVNT_Export 
+  idlflags += -Wb,skel_export_include=BMDisplay_svnt_export.h
+
+  libs += BMDisplay_stub
+
   dynamicflags   = BMDISPLAY_STUB_BUILD_DLL
 
   IDL_Files {
diff --git a/TAO/CIAO/examples/OEP/BasicSP/EC/EC.mpc b/TAO/CIAO/examples/OEP/BasicSP/EC/EC.mpc
index b5d7a251536..3544eac4714 100644
--- a/TAO/CIAO/examples/OEP/BasicSP/EC/EC.mpc
+++ b/TAO/CIAO/examples/OEP/BasicSP/EC/EC.mpc
@@ -4,7 +4,14 @@
 project(EC_stub): ciao_client {
   after += BasicSP_stub
   sharedname = EC_stub
-  idlflags += -Wb,stub_export_macro=EC_STUB_Export -Wb,stub_export_include=EC_stub_export.h -Wb,skel_export_macro=EC_SVNT_Export -Wb,skel_export_include=EC_svnt_export.h
+
+  libs += BasicSP_stub
+
+  idlflags += -Wb,stub_export_macro=EC_STUB_Export 
+  idlflags += -Wb,stub_export_include=EC_stub_export.h 
+  idlflags += -Wb,skel_export_macro=EC_SVNT_Export 
+  idlflags += -Wb,skel_export_include=EC_svnt_export.h
+
   dynamicflags   = EC_STUB_BUILD_DLL
 
   IDL_Files {
@@ -19,9 +26,11 @@ project(EC_stub): ciao_client {
 project(EC_svnt) : ciao_servant {
   after += BasicSP_svnt EC_stub
   sharedname  = EC_svnt
-  libs    += EC_stub BasicSP_stub BasicSP_svnt
+  libs     += EC_stub BasicSP_stub BasicSP_svnt
   libpaths += ..
-  idlflags  +=  -Wb,export_macro=EC_SVNT_Export -Wb,export_include=EC_svnt_export.h
+  idlflags += -Wb,export_macro=EC_SVNT_Export 
+  idlflags += -Wb,export_include=EC_svnt_export.h
+
   dynamicflags = EC_SVNT_BUILD_DLL
 
   CIDL_Files {
@@ -44,8 +53,9 @@ project(EC_exec) : ciao_component {
   after += EC_svnt
   sharedname = EC_exec
   libs      += EC_stub BasicSP_stub EC_svnt
-  libpaths += ..
-  idlflags  +=  -Wb,export_macro=EC_EXEC_Export -Wb,export_include=EC_exec_export.h
+  libpaths  += ..
+  idlflags  +=  -Wb,export_macro=EC_EXEC_Export 
+  idlflags  += -Wb,export_include=EC_exec_export.h
   dynamicflags   = EC_EXEC_BUILD_DLL
 
   IDL_Files {
diff --git a/TAO/CIAO/examples/OEP/Display/GPS/GPS.mpc b/TAO/CIAO/examples/OEP/Display/GPS/GPS.mpc
index 635fb423371..161b483d369 100644
--- a/TAO/CIAO/examples/OEP/Display/GPS/GPS.mpc
+++ b/TAO/CIAO/examples/OEP/Display/GPS/GPS.mpc
@@ -5,7 +5,14 @@
 project(GPS_stub): ciao_client {
   after += HUDisplay_stub
   sharedname = GPS_stub
-  idlflags += -Wb,stub_export_macro=GPS_STUB_Export -Wb,stub_export_include=GPS_stub_export.h -Wb,skel_export_macro=GPS_SVNT_Export -Wb,skel_export_include=GPS_svnt_export.h
+  
+  libs += GPS_stub
+
+  idlflags += -Wb,stub_export_macro=GPS_STUB_Export 
+  idlflags += -Wb,stub_export_include=GPS_stub_export.h 
+  idlflags += -Wb,skel_export_macro=GPS_SVNT_Export 
+  idlflags += -Wb,skel_export_include=GPS_svnt_export.h
+
   dynamicflags   = GPS_STUB_BUILD_DLL
 
   IDL_Files {
@@ -20,9 +27,14 @@ project(GPS_stub): ciao_client {
 project(GPS_svnt) : ciao_servant {
   after += HUDisplay_svnt GPS_stub
   sharedname  = GPS_svnt
+
   libs    += GPS_stub HUDisplay_stub HUDisplay_svnt
+
   libpaths += ..
-  idlflags  +=  -Wb,export_macro=GPS_SVNT_Export -Wb,export_include=GPS_svnt_export.h
+
+  idlflags  +=  -Wb,export_macro=GPS_SVNT_Export 
+  idlflags  += -Wb,export_include=GPS_svnt_export.h
+
   dynamicflags = GPS_SVNT_BUILD_DLL
 
   CIDL_Files {
@@ -46,7 +58,8 @@ project(GPS_exec) : ciao_component {
   sharedname = GPS_exec
   libs      += GPS_stub GPS_svnt HUDisplay_stub HUDisplay_svnt
   libpaths += ..
-  idlflags  +=  -Wb,export_macro=GPS_EXEC_Export -Wb,export_include=GPS_exec_export.h
+  idlflags  += -Wb,export_macro=GPS_EXEC_Export 
+  idlflags  += -Wb,export_include=GPS_exec_export.h
   dynamicflags   = GPS_EXEC_BUILD_DLL
 
   IDL_Files {
@@ -64,7 +77,8 @@ project(GPS_tracing_exec) : ciao_component {
   sharedname = GPS_tracing_exec
   libs      += GPS_stub GPS_svnt HUDisplay_stub HUDisplay_svnt
   libpaths += ..
-  idlflags  +=  -Wb,export_macro=GPS_EXEC_Export -Wb,export_include=GPS_exec_export.h
+  idlflags  += -Wb,export_macro=GPS_EXEC_Export 
+  idlflags  += -Wb,export_include=GPS_exec_export.h
   dynamicflags   = GPS_EXEC_BUILD_DLL
 
   IDL_Files {
diff --git a/TAO/CIAO/examples/OEP/Display/NavDisplay/NavDisplay.mpc b/TAO/CIAO/examples/OEP/Display/NavDisplay/NavDisplay.mpc
index 4123dcdb27a..1e7b1ba71a3 100644
--- a/TAO/CIAO/examples/OEP/Display/NavDisplay/NavDisplay.mpc
+++ b/TAO/CIAO/examples/OEP/Display/NavDisplay/NavDisplay.mpc
@@ -4,7 +4,14 @@
 project(NavDisplay_stub): ciao_client {
   after += HUDisplay_stub
   sharedname = NavDisplay_stub
-  idlflags += -Wb,stub_export_macro=NAVDISPLAY_STUB_Export -Wb,stub_export_include=NavDisplay_stub_export.h -Wb,skel_export_macro=NAVDISPLAY_SVNT_Export -Wb,skel_export_include=NavDisplay_svnt_export.h
+  
+  libs += NavDisplay_stub
+
+  idlflags += -Wb,stub_export_macro=NAVDISPLAY_STUB_Export 
+  idlflags += -Wb,stub_export_include=NavDisplay_stub_export.h 
+  idlflags += -Wb,skel_export_macro=NAVDISPLAY_SVNT_Export 
+  idlflags += -Wb,skel_export_include=NavDisplay_svnt_export.h
+
   dynamicflags   = NAVDISPLAY_STUB_BUILD_DLL
 
   IDL_Files {
@@ -21,7 +28,8 @@ project(NavDisplay_svnt) : ciao_servant {
   sharedname  = NavDisplay_svnt
   libs    += NavDisplay_stub HUDisplay_stub HUDisplay_svnt
   libpaths += ..
-  idlflags  +=  -Wb,export_macro=NAVDISPLAY_SVNT_Export -Wb,export_include=NavDisplay_svnt_export.h
+  idlflags  += -Wb,export_macro=NAVDISPLAY_SVNT_Export 
+  idlflags  += -Wb,export_include=NavDisplay_svnt_export.h
   dynamicflags = NAVDISPLAY_SVNT_BUILD_DLL
 
   CIDL_Files {
@@ -45,7 +53,8 @@ project(NavDisplay_exec) : ciao_component {
   sharedname = NavDisplay_exec
   libs      += NavDisplay_stub NavDisplay_svnt HUDisplay_stub HUDisplay_svnt
   libpaths += ..
-  idlflags  +=  -Wb,export_macro=NAVDISPLAY_EXEC_Export -Wb,export_include=NavDisplay_exec_export.h
+  idlflags  += -Wb,export_macro=NAVDISPLAY_EXEC_Export 
+  idlflags  += -Wb,export_include=NavDisplay_exec_export.h
   dynamicflags   = NAVDISPLAY_EXEC_BUILD_DLL
 
   IDL_Files {
diff --git a/TAO/CIAO/examples/OEP/Display/RateGen/RateGen.mpc b/TAO/CIAO/examples/OEP/Display/RateGen/RateGen.mpc
index cfe7fc7e2a3..d01e2c8aabe 100644
--- a/TAO/CIAO/examples/OEP/Display/RateGen/RateGen.mpc
+++ b/TAO/CIAO/examples/OEP/Display/RateGen/RateGen.mpc
@@ -4,8 +4,15 @@
 project(RateGen_stub): ciao_client {
   after += HUDisplay_stub
   sharedname = RateGen_stub
-  idlflags += -Wb,stub_export_macro=RATEGEN_STUB_Export -Wb,stub_export_include=RateGen_stub_export.h -Wb,skel_export_macro=RATEGEN_SVNT_Export -Wb,skel_export_include=RateGen_svnt_export.h
+
+  idlflags += -Wb,stub_export_macro=RATEGEN_STUB_Export 
+  idlflags += -Wb,stub_export_include=RateGen_stub_export.h 
+  idlflags += -Wb,skel_export_macro=RATEGEN_SVNT_Export 
+  idlflags += -Wb,skel_export_include=RateGen_svnt_export.h
+
   dynamicflags   = RATEGEN_STUB_BUILD_DLL
+ 
+  libs += RateGen_stub
 
   IDL_Files {
     RateGen.idl
@@ -21,7 +28,8 @@ project(RateGen_svnt) : ciao_servant {
   sharedname  = RateGen_svnt
   libs    += RateGen_stub HUDisplay_stub HUDisplay_svnt
   libpaths += ..
-  idlflags  +=  -Wb,export_macro=RATEGEN_SVNT_Export -Wb,export_include=RateGen_svnt_export.h
+  idlflags +=  -Wb,export_macro=RATEGEN_SVNT_Export 
+  idlflags += -Wb,export_include=RateGen_svnt_export.h
   dynamicflags = RATEGEN_SVNT_BUILD_DLL
 
   CIDL_Files {
@@ -44,8 +52,9 @@ project(RateGen_exec) : ciao_component {
   after   += RateGen_svnt
   sharedname = RateGen_exec
   libs      += RateGen_stub HUDisplay_stub RateGen_svnt
-  libpaths += ..
-  idlflags  +=  -Wb,export_macro=RATEGEN_EXEC_Export -Wb,export_include=RateGen_exec_export.h
+  libpaths  += ..
+  idlflags  +=  -Wb,export_macro=RATEGEN_EXEC_Export 
+  idlflags  += -Wb,export_include=RateGen_exec_export.h
   dynamicflags   = RATEGEN_EXEC_BUILD_DLL
 
   IDL_Files {
diff --git a/TAO/CIAO/examples/OEP/Display/RateGen/RateGen_exec.cpp b/TAO/CIAO/examples/OEP/Display/RateGen/RateGen_exec.cpp
index 4691c7cd8fc..a79c4d0a3b1 100644
--- a/TAO/CIAO/examples/OEP/Display/RateGen/RateGen_exec.cpp
+++ b/TAO/CIAO/examples/OEP/Display/RateGen/RateGen_exec.cpp
@@ -24,13 +24,13 @@ MyImpl::Pulse_Handler::~Pulse_Handler ()
 }
 
 int
-MyImpl::Pulse_Handler::open ()
+MyImpl::Pulse_Handler::open_h ()
 {
   return this->activate ();
 }
 
 int
-MyImpl::Pulse_Handler::close ()
+MyImpl::Pulse_Handler::close_h ()
 {
   this->done_ = 1;
   this->reactor ()->notify ();
@@ -242,7 +242,7 @@ MyImpl::RateGen_exec_i::ccm_activate (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
                   "MyImpl::RateGen_exec_i::ccm_activate\n"));
     }
 
-  this->pulser_.open ();
+  this->pulser_.open_h ();
 }
 
 void
@@ -263,7 +263,7 @@ MyImpl::RateGen_exec_i::ccm_passivate (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
                   "MyImpl::RateGen_exec_i::ccm_passivate\n"));
     }
 
-  this->pulser_.close ();
+  this->pulser_.close_h ();
 }
 
 void
diff --git a/TAO/CIAO/examples/OEP/Display/RateGen/RateGen_exec.h b/TAO/CIAO/examples/OEP/Display/RateGen/RateGen_exec.h
index 9d9779c4b02..7e29d047e75 100644
--- a/TAO/CIAO/examples/OEP/Display/RateGen/RateGen_exec.h
+++ b/TAO/CIAO/examples/OEP/Display/RateGen/RateGen_exec.h
@@ -32,9 +32,9 @@ namespace MyImpl
     Pulse_Handler (RateGen_exec_i *cb);
     ~Pulse_Handler ();
 
-    int open (void);
+    int open_h (void);
 
-    int close (void);
+    int close_h (void);
 
     int start (CORBA::Long hertz);