Fri Aug 27 13:58:34 UTC 2010 Johnny Willemsen <jwillemsen@remedy.nl>

        * examples/DevGuideExamples/Messenger/History_exec_i.cpp:
        * examples/DevGuideExamples/Messenger/Messenger_exec_i.cpp:
        * examples/DevGuideExamples/Messenger/Publication_exec_i.cpp:
          Use ACE_GUARD macro

3 files changed, 8 insertions, 8 deletions

diff --git a/CIAO/examples/DevGuideExamples/Messenger/History_exec_i.cpp b/CIAO/examples/DevGuideExamples/Messenger/History_exec_i.cpp
index 1afb8060fc2..2c3f36d206c 100644
--- a/CIAO/examples/DevGuideExamples/Messenger/History_exec_i.cpp
+++ b/CIAO/examples/DevGuideExamples/Messenger/History_exec_i.cpp
@@ -42,7 +42,7 @@ namespace CIAO_Messenger_Impl
     // Your code here.
 
     // MY CODE
-    ACE_Guard<TAO_SYNCH_MUTEX> guard(this->lock_);
+    ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->lock_);
 
     ACE_DEBUG((LM_INFO, ACE_TEXT("History_i::get_all\n") ));
 
@@ -69,7 +69,7 @@ namespace CIAO_Messenger_Impl
     // Your code here.
 
     // MY CODE
-    ACE_Guard<TAO_SYNCH_MUTEX> guard(this->lock_);
+    ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->lock_);
 
     ACE_DEBUG((LM_INFO, ACE_TEXT("History_i::get_latest\n") ));
 
@@ -84,7 +84,7 @@ namespace CIAO_Messenger_Impl
   void
   History_exec_i::add( ::Message* message )
   {
-    ACE_Guard<TAO_SYNCH_MUTEX> guard(lock_);
+    ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->lock_);
 
     // bump up the reference count; we don't own it.
     // the _var in the STL list takes ownership of the "copy"
diff --git a/CIAO/examples/DevGuideExamples/Messenger/Messenger_exec_i.cpp b/CIAO/examples/DevGuideExamples/Messenger/Messenger_exec_i.cpp
index c71b7b82504..33163a52184 100644
--- a/CIAO/examples/DevGuideExamples/Messenger/Messenger_exec_i.cpp
+++ b/CIAO/examples/DevGuideExamples/Messenger/Messenger_exec_i.cpp
@@ -62,7 +62,7 @@ namespace CIAO_Messenger_Impl
       // get the run_lock from the Runnable executor; we have an
       // agreement with the Runnable executor that we must posess the
       // run_lock to publish
-      ACE_Guard<TAO_SYNCH_MUTEX> guard( this->control_->get_run_lock() );
+      ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->control_->get_run_lock());
 
       // create a message to publish
       ::Message_var msg = new ::OBV_Message();
diff --git a/CIAO/examples/DevGuideExamples/Messenger/Publication_exec_i.cpp b/CIAO/examples/DevGuideExamples/Messenger/Publication_exec_i.cpp
index 4c87e597459..16740c35273 100644
--- a/CIAO/examples/DevGuideExamples/Messenger/Publication_exec_i.cpp
+++ b/CIAO/examples/DevGuideExamples/Messenger/Publication_exec_i.cpp
@@ -42,7 +42,7 @@ namespace CIAO_Messenger_Impl
   char*
   Publication_exec_i::text ()
   {
-    ACE_Guard<TAO_SYNCH_MUTEX> guard(this->lock_);
+    ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->lock_);
 
     return CORBA::string_dup( this->text_.c_str() );
   }
@@ -51,7 +51,7 @@ namespace CIAO_Messenger_Impl
   Publication_exec_i::text (
   const char* text)
   {
-    ACE_Guard<TAO_SYNCH_MUTEX> guard(this->lock_);
+    ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->lock_);
 
     this->text_ = text;
     ACE_DEBUG((LM_INFO, ACE_TEXT("publication text changed to %C\n"), text ));
@@ -60,7 +60,7 @@ namespace CIAO_Messenger_Impl
   CORBA::UShort
   Publication_exec_i::period ()
   {
-    ACE_Guard<TAO_SYNCH_MUTEX> guard(this->lock_);
+    ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->lock_);
 
     return this->period_;
   }
@@ -68,7 +68,7 @@ namespace CIAO_Messenger_Impl
   void
   Publication_exec_i::period (CORBA::UShort period)
   {
-    ACE_Guard<TAO_SYNCH_MUTEX> guard( this->lock_ );
+    ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->lock_);
 
     if ( period > 0 ) {
       this->period_ = period;