Merged revisions 81245-81247 via svnmerge from

https://svn.dre.vanderbilt.edu/DOC/Middleware/trunk/ACE

........
  r81245 | johnnyw | 2008-04-05 08:37:47 -0500 (Sat, 05 Apr 2008) | 1 line
  
  Sat Apr  5 13:36:57 UTC 2008  Johnny Willemsen  <jwillemsen@remedy.nl>
........
  r81246 | johnnyw | 2008-04-05 08:43:16 -0500 (Sat, 05 Apr 2008) | 1 line
  
  Sat Apr  5 13:42:57 UTC 2008  Johnny Willemsen  <jwillemsen@remedy.nl>
........
  r81247 | iliyan | 2008-04-05 11:43:10 -0500 (Sat, 05 Apr 2008) | 1 line
  
  ChangeLogTag: Sat Apr  5 16:21:50 UTC 2008  Iliyan Jeliazkov  <iliyan@ociweb.com>
........

7 files changed, 39 insertions, 16 deletions

diff --git a/ACE/ChangeLog b/ACE/ChangeLog
index ec6a4b41073..26b97f4c899 100644
--- a/ACE/ChangeLog
+++ b/ACE/ChangeLog
@@ -1,3 +1,30 @@
+Sat Apr  5 16:21:50 UTC 2008  Iliyan Jeliazkov  <iliyan@ociweb.com>
+
+        * ace/Service_Config.inl:
+        * ace/Service_Config.cpp:
+        * ace/Service_Gestalt.cpp:
+        * ace/Service_Gestalt.h:
+
+          Making SG intrusively refcountable by introducing
+          intrusive_{add,remove}_ref methods and a refcounter. Adding
+          skip_default_svc_conf_file parameter in process_directives.
+
+        * ace/svcconf.mpb:
+        * tests/Object_Manager_Flipping_Test.cpp:
+
+          Reformatting and cleanup.
+
+
+Sat Apr  5 13:42:57 UTC 2008  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tests/Bug_2980_Regression_Test.cpp:
+          Fixed argument not used warnings
+
+Sat Apr  5 13:36:57 UTC 2008  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ace/Parse_Node.cpp:
+          Moved include out of versioned namespace block
+
 Sat Apr  5 11:50:40 UTC 2008  Iliyan Jeliazkov  <iliyan@ociweb.com>
 
         * ace/Parse_Node.cpp:
diff --git a/ACE/ace/Parse_Node.cpp b/ACE/ace/Parse_Node.cpp
index f42311503a5..fab2580bcc7 100644
--- a/ACE/ace/Parse_Node.cpp
+++ b/ACE/ace/Parse_Node.cpp
@@ -9,6 +9,7 @@
 #include "ace/DLL.h"
 #include "ace/ACE.h"
 #include "ace/OS_NS_string.h"
+#include "ace/ARGV.h"
 
 ACE_RCSID (ace,
            Parse_Node,
@@ -30,8 +31,6 @@ ACE_Stream_Node::dump (void) const
 #endif /* ACE_HAS_DUMP */
 }
 
-#include "ace/ARGV.h"
-
 void
 ACE_Stream_Node::apply (ACE_Service_Gestalt *config, int &yyerrno)
 {
diff --git a/ACE/ace/Service_Gestalt.cpp b/ACE/ace/Service_Gestalt.cpp
index e97e7318616..8c78c76f216 100644
--- a/ACE/ace/Service_Gestalt.cpp
+++ b/ACE/ace/Service_Gestalt.cpp
@@ -148,9 +148,6 @@ ACE_Service_Gestalt::Processed_Static_Svc::~Processed_Static_Svc (void)
   delete [] name_;
 }
 
-// ----------------------------------------
-
-
 void
 ACE_Service_Gestalt::intrusive_add_ref (ACE_Service_Gestalt* g)
 {
@@ -172,7 +169,6 @@ ACE_Service_Gestalt::intrusive_remove_ref (ACE_Service_Gestalt* g)
       if (tmp <= 0)  delete g;
       ACE_ASSERT (tmp >= 0);
     }
-
 }
 
 
@@ -212,8 +208,6 @@ ACE_Service_Gestalt::~ACE_Service_Gestalt (void)
 
   delete this->svc_conf_file_queue_;
   this->svc_conf_file_queue_ = 0;
-
-  //  ACE_DEBUG ((LM_STARTUP, "(%P|%t) ACE_Service_Gestalt::~ACE_Service_Gestalt\n"));
 }
 
 ACE_Service_Gestalt::ACE_Service_Gestalt (size_t size,
@@ -1239,14 +1233,14 @@ ACE_Service_Gestalt::process_directives (bool ignore_default_svc_conf_file)
     {
       if (*sptr == default_svc_conf && ignore_default_svc_conf_file)
         continue;
-
+      
       int result = this->process_file (sptr->fast_rep ());
       if (result < 0)
         return result;
     }
-
+  
   return 0;
-
+  
 } /* process_directives () */
 
 // Tidy up and perform last rites on a terminating ACE_Service_Gestalt.
diff --git a/ACE/ace/Service_Gestalt.h b/ACE/ace/Service_Gestalt.h
index 8952e2ffaf3..3c356de832f 100644
--- a/ACE/ace/Service_Gestalt.h
+++ b/ACE/ace/Service_Gestalt.h
@@ -493,6 +493,7 @@ private:
   size_t repo_begin_;
   ACE_TCHAR const * const name_;
 
+
 # if defined (ACE_MT_SAFE) && (ACE_MT_SAFE != 0)
   ACE_Guard< ACE_Recursive_Thread_Mutex > repo_monitor_;
 #endif
diff --git a/ACE/ace/svcconf.mpb b/ACE/ace/svcconf.mpb
index 40f2d545367..0ab77af76cd 100644
--- a/ACE/ace/svcconf.mpb
+++ b/ACE/ace/svcconf.mpb
@@ -30,9 +30,10 @@ feature(ace_svcconf) {
     "Svc_Conf_y.cpp: Svc_Conf.y"
     "ifeq ($(notdir $(YACC)), bison)"
     "	$(YACC) -l -d Svc_Conf.y"
-    "	sed -e 's/char \\*getenv/char *ace_foo/g' \\"    // Eliminates getenv prototype, use ACE's
+    "	sed -e 's/char \\*getenv/char *ace_foo/g' \\"  // Eliminates getenv prototype, use ACE's
     "       -e 's/= getenv/= ACE_OS::getenv/g' \\"     // ... like this - qualified.
     "       -e 's/fprintf/ACE_OS::fprintf/g' \\"       // Use ACE's fprintf, not library's
+    "       -e 's/\t/  /g' \\"                         // Eliminate tabs (replace with 2 spaces)
     "       -e 's/yy/ace_yy/g' \\"
     "       -e 's/->ace_yyerrno/->yyerrno/g' \\"       // These reverse the unwanted ace_ prefix
     "       -e 's/->ace_yylineno/->yylineno/g' \\"     // added by the substitution, above.
@@ -49,8 +50,8 @@ feature(ace_svcconf) {
     "       -e 's/Svc_Conf\\.tab\\.c/Svc_Conf_y.cpp/g' < Svc_Conf.tab.c > /tmp/$@"
     "	cp /tmp/$@ $@"
     "	echo \/\/ '$$I''d:$$' >Svc_Conf_Tokens.h"
-    "	echo '#ifndef BISON_SVC_CONF_TAB_H' >>Svc_Conf_Tokens.h"    // Inclusion protection macros
-    "	echo '# define BISON_SVC_CONF_TAB_H' >>Svc_Conf_Tokens.h"   // ... same ...
+    "	echo '#ifndef BISON_SVC_CONF_TAB_H' >>Svc_Conf_Tokens.h"       // Inclusion protection macros
+    "	echo '# define BISON_SVC_CONF_TAB_H' >>Svc_Conf_Tokens.h"      // ... same ...
     "	echo '# define ACE_YYSTYPE_IS_DECLARED 1' >>Svc_Conf_Tokens.h" // Don't use Svc_Conf_y.cpp's
     "	sed -e 's/yy/ace_yy/g' \\"
     "     -e 's/YY/ACE_YY/g'  <Svc_Conf.tab.h >>Svc_Conf_Tokens.h"
diff --git a/ACE/tests/Bug_2980_Regression_Test.cpp b/ACE/tests/Bug_2980_Regression_Test.cpp
index 61ecb617c9e..90beef77103 100644
--- a/ACE/tests/Bug_2980_Regression_Test.cpp
+++ b/ACE/tests/Bug_2980_Regression_Test.cpp
@@ -87,7 +87,7 @@ void * loadunloadDll(void *pp)
 }
 #endif /* !defined (ACE_WIN32) */
 
-int main(int argc, char ** argv)
+int main(int, char **)
 {
 
 #if defined (WIN32)
diff --git a/ACE/tests/Object_Manager_Flipping_Test.cpp b/ACE/tests/Object_Manager_Flipping_Test.cpp
index 36f61a19383..876fafe790c 100644
--- a/ACE/tests/Object_Manager_Flipping_Test.cpp
+++ b/ACE/tests/Object_Manager_Flipping_Test.cpp
@@ -27,6 +27,7 @@
 #include "ace/OS_Memory.h"
 #include "ace/ACE.h"
 #include "ace/Service_Config.h"
+#include "ace/Intrusive_Auto_Ptr.h"
 
 ACE_RCSID(tests, Object_Manager_Flipping_Test, "$Id$")
 
@@ -111,7 +112,7 @@ int run_main (int, ACE_TCHAR *[])
     ACE::init();
     ACE_START_TEST (ACE_TEXT ("Object_Manager_Flipping_Test"));
 
-    ACE_Service_Gestalt_Auto_Ptr p2 (ACE_Service_Config::instance ());
+    ACE_Intrusive_Auto_Ptr<ACE_Service_Gestalt> p2 (ACE_Service_Config::instance ());
 
     // ACE_ASSERT uses Log_Msg::instance() and needs to be done only
     // after ACE_START_TEST