Mon Apr 12 09:23:23 UTC 2010 Johnny Willemsen <jwillemsen@remedy.nl>

        * TAO_IDL/be/be_visitor_component/context_svs.cpp:
        * TAO_IDL/be/be_visitor_component/servant_svs.cpp:
          Use ACE_GUARD for a regular mutex, not read/write guards

3 files changed, 37 insertions, 31 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 0aab6655bf8..c9d0cd94842 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,9 @@
+Mon Apr 12 09:23:23 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * TAO_IDL/be/be_visitor_component/context_svs.cpp:
+        * TAO_IDL/be/be_visitor_component/servant_svs.cpp:
+          Use ACE_GUARD for a regular mutex, not read/write guards
+
 Mon Apr 12 06:53:23 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
 
         * docs/compiler.html
diff --git a/TAO/TAO_IDL/be/be_visitor_component/context_svs.cpp b/TAO/TAO_IDL/be/be_visitor_component/context_svs.cpp
index 6574a9bce5a..66e15f73a2f 100644
--- a/TAO/TAO_IDL/be/be_visitor_component/context_svs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_component/context_svs.cpp
@@ -132,9 +132,9 @@ be_visitor_context_svs::visit_publishes (be_publishes *node)
       << "::" << fname << " * ev)" << be_uidt_nl
       << "{" << be_idt_nl;
 
-  os_ << "ACE_READ_GUARD (TAO_SYNCH_MUTEX," << be_nl
-      << "                mon," << be_nl
-      << "                this->" << port_name
+  os_ << "ACE_GUARD (TAO_SYNCH_MUTEX," << be_nl
+      << "           mon," << be_nl
+      << "           this->" << port_name
       << "_lock_);" << be_nl << be_nl;
 
   os_ << "for (" << tao_cg->upcase (port_name)
@@ -170,11 +170,11 @@ be_visitor_context_svs::visit_publishes (be_publishes *node)
       << "Consumer::_duplicate (c);" << be_nl << be_nl;
 
   os_ << "{" << be_idt_nl
-      << "ACE_WRITE_GUARD_RETURN (TAO_SYNCH_MUTEX," << be_nl
-      << "                        mon," << be_nl
-      << "                        this->" << port_name
+      << "ACE_GUARD_RETURN (TAO_SYNCH_MUTEX," << be_nl
+      << "                  mon," << be_nl
+      << "                  this->" << port_name
       << "_lock_," << be_nl
-      << "                        0);" << be_nl << be_nl;
+      << "                  0);" << be_nl << be_nl;
 
   os_ << "result = this->ciao_publishes_" << port_name
       << "_.insert (entry);";
@@ -217,11 +217,11 @@ be_visitor_context_svs::visit_publishes (be_publishes *node)
       << "}" << be_uidt_nl << be_nl;
 
   os_ << "{" << be_idt_nl
-      << "ACE_WRITE_GUARD_RETURN (TAO_SYNCH_MUTEX," << be_nl
-      << "                        mon," << be_nl
-      << "                        this->" << port_name
+      << "ACE_GUARD_RETURN (TAO_SYNCH_MUTEX," << be_nl
+      << "                  mon," << be_nl
+      << "                  this->" << port_name
       << "_lock_," << be_nl
-      << "                        ::" << fname
+      << "                  ::" << fname
       << "Consumer::_nil ());" << be_nl << be_nl;
 
   os_ << tao_cg->upcase (port_name) << "_TABLE::iterator iter ="
@@ -385,11 +385,11 @@ be_visitor_context_svs::gen_uses_multiplex (
       << port_name << " (void)" << be_nl
       << "{" << be_idt_nl;
 
-  os_ << "ACE_READ_GUARD_RETURN (TAO_SYNCH_MUTEX," << be_nl
-      << "                       mon," << be_nl
-      << "                       this->" << port_name
+  os_ << "ACE_GUARD_RETURN (TAO_SYNCH_MUTEX," << be_nl
+      << "                  mon," << be_nl
+      << "                  this->" << port_name
       << "_lock_," << be_nl
-      << "                       0);" << be_nl << be_nl;
+      << "                  0);" << be_nl << be_nl;
 
   os_ << "::" << node_->full_name () << "::" << port_name
       << "Connections * tmp_retv = 0;" << be_nl
@@ -442,11 +442,11 @@ be_visitor_context_svs::gen_uses_multiplex (
 
   os_ << be_nl << be_nl
       << "{" << be_idt_nl
-      << "ACE_WRITE_GUARD_RETURN (TAO_SYNCH_MUTEX," << be_nl
-      << "                        mon," << be_nl
-      << "                        this->" << port_name
+      << "ACE_GUARD_RETURN (TAO_SYNCH_MUTEX," << be_nl
+      << "                  mon," << be_nl
+      << "                  this->" << port_name
       << "_lock_," << be_nl
-      << "                        0);";
+      << "                  0);";
 
   os_ << be_nl << be_nl
       << "result = this->ciao_uses_" << port_name
@@ -488,11 +488,11 @@ be_visitor_context_svs::gen_uses_multiplex (
 
   os_ << be_nl << be_nl
       << "{" << be_idt_nl
-      << "ACE_WRITE_GUARD_RETURN (TAO_SYNCH_MUTEX," << be_nl
-      << "                        mon," << be_nl
-      << "                        this->" << port_name
+      << "ACE_GUARD_RETURN (TAO_SYNCH_MUTEX," << be_nl
+      << "                  mon," << be_nl
+      << "                  this->" << port_name
       << "_lock_," << be_nl
-      << "                        ::" << fname
+      << "                  ::" << fname
       << "::_nil ());";
 
   os_ << be_nl << be_nl
diff --git a/TAO/TAO_IDL/be/be_visitor_component/servant_svs.cpp b/TAO/TAO_IDL/be/be_visitor_component/servant_svs.cpp
index d6fa5cab86a..26724302873 100644
--- a/TAO/TAO_IDL/be/be_visitor_component/servant_svs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_component/servant_svs.cpp
@@ -1356,11 +1356,11 @@ be_visitor_receptacle_desc::visit_uses (be_uses *node)
   if (gen_guard)
     {
       os_ << "{" << be_idt_nl
-          << "ACE_READ_GUARD_RETURN (TAO_SYNCH_MUTEX," << be_nl
-          << "                       mon," << be_nl
-          << "                       this->context_->"
+          << "ACE_GUARD_RETURN (TAO_SYNCH_MUTEX," << be_nl
+          << "                  mon," << be_nl
+          << "                  this->context_->"
           << port_name << "_lock_," << be_nl
-          << "                       0);" << be_nl << be_nl;
+          << "                  0);" << be_nl << be_nl;
     }
 
   os_ << "::CIAO::Servant::describe_"
@@ -1482,11 +1482,11 @@ be_visitor_event_source_desc::visit_publishes (
   os_ << be_nl << be_nl;
 
   os_ << "{" << be_idt_nl
-      << "ACE_READ_GUARD_RETURN (TAO_SYNCH_MUTEX," << be_nl
-      << "                       mon," << be_nl
-      << "                       this->context_->"
+      << "ACE_GUARD_RETURN (TAO_SYNCH_MUTEX," << be_nl
+      << "                  mon," << be_nl
+      << "                  this->context_->"
       << port_name << "_lock_," << be_nl
-      << "                       0);" << be_nl << be_nl;
+      << "                  0);" << be_nl << be_nl;
 
   os_ << "::CIAO::Servant::describe_pub_event_source<"
       << be_idt_nl