Merged revisions 81155-81156 via svnmerge from

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

........
  r81155 | johnnyw | 2008-03-30 13:55:38 -0500 (Sun, 30 Mar 2008) | 1 line
........
  r81156 | iliyan | 2008-03-30 15:56:47 -0500 (Sun, 30 Mar 2008) | 1 line
  
  ChangeLogTag: Sun Mar 30 19:54:23 UTC 2008  Iliyan Jeliazkov  <iliyan@ociweb.com>
........

3 files changed, 69 insertions, 2 deletions

diff --git a/ACE/ChangeLog b/ACE/ChangeLog
index fc433d5c06e..a644b819c54 100644
--- a/ACE/ChangeLog
+++ b/ACE/ChangeLog
@@ -1,3 +1,69 @@
+Sun Mar 30 19:54:23 UTC 2008  Iliyan Jeliazkov  <iliyan@ociweb.com>
+
+          This is the first step of merging the changes from the gestalt
+          refactoring branch. It includes only changes that are merely
+          peripheral, without impacting the actual configuration mechanism
+          - yet.
+
+        * ace/ARGV.h:
+        * ace/ARGV.cpp:
+
+          Introducing a ctor that takes the number of parameters in argv,
+          thus eliminating the requirement to have argv 0-terminated.  This
+          requirement can be a hard to satisfy in cases where the argv has
+          been "manualy constructed", i.e. not provided by the OS
+          environment.
+
+        * ace/Intrusive_Auto_Ptr.h:
+        * ace/Intrusive_Auto_Ptr.inl:
+        * ace/Intrusive_Auto_Ptr.cpp:
+
+          Added an intrusive auto pointer implementation. It is a reference
+          counted auto pointer that can be used for types with explicit
+          reference management implementations.
+
+        * ace/OS_NS_unistd.h:
+        * ace/OS_NS_unistd.cpp:
+
+          Introducing new argv_to_string which takes an explicit argc
+          argument and relaxes the requirement on argv (to be 0-terminated).
+
+        * ace/Refcounted_Auto_Ptr.h:
+        * ace/Refcounted_Auto_Ptr.inl:
+
+          Adding a mechanism that provides a correct conversion to boolean
+          for smart pointers, which preserves the smantics of "if (ap) ..."
+          without the unwanted side effects. Credit goes to Andrei
+          Alexandrescu's Modern C++ Design book.
+
+        * ace/Service_Types.cpp:
+
+          Cosmetics: adding this-> to member references.
+
+        * examples/ASX/CCM_App/ASX_CCM_App.mpc:
+        * examples/ASX/CCM_App/CCM_App.cpp:
+
+          Fixing a problem that precludes the test from running correctly
+          on *nix - the DLL names are not case-insensitive. Minor layout
+          changes.
+
+        * tests/Intrusive_Auto_Ptr_Test.cpp:
+
+          A test for the new auto ptr.
+
+        * tests/Bug_2980_Regression_Dll.cpp:
+        * tests/Bug_2980_Regression_Test.cpp:
+        * tests/run_test.lst:
+        * tests/tests.mpc:
+
+          Addded a test for bug 2980. Thanks to Lothar Werzinger <lothar
+          at tradescape biz> for contributing the code.
+
+Sun Mar 30 18:54:57 UTC 2008  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * bin/PerlACE/ProcessVX_Win32.pm:
+          Handle single quotes in the executable arguments
+
 Sat Mar 29 08:16:57 UTC 2008  Johnny Willemsen  <jwillemsen@remedy.nl>
 
         * tests/Reactor_Dispatch_Order_Test.cpp:
diff --git a/ACE/ace/Refcounted_Auto_Ptr.h b/ACE/ace/Refcounted_Auto_Ptr.h
index d9845ad510e..68afed45a0a 100644
--- a/ACE/ace/Refcounted_Auto_Ptr.h
+++ b/ACE/ace/Refcounted_Auto_Ptr.h
@@ -85,7 +85,7 @@ public:
   /// ACE_Refcounted_Auto_Ptr_Rep. An ACE_Refcounted_Auto_Ptr_Rep
   /// is created if necessary.
   void operator = (const ACE_Refcounted_Auto_Ptr<X, ACE_LOCK> &r);
-  
+
   /// Equality operator that returns @c true if both
   /// ACE_Refcounted_Auto_Ptr objects point to the same underlying
   /// representation. It does not compare the actual pointers.
@@ -103,7 +103,7 @@ public:
 
   /// Accessor method.
   X &operator *() const;
-  
+
   /// Check rep easily.
   bool operator !() const;
 
diff --git a/ACE/bin/PerlACE/ProcessVX_Win32.pm b/ACE/bin/PerlACE/ProcessVX_Win32.pm
index 3ecd7a1d06e..1929db86799 100644
--- a/ACE/bin/PerlACE/ProcessVX_Win32.pm
+++ b/ACE/bin/PerlACE/ProcessVX_Win32.pm
@@ -245,6 +245,7 @@ sub Spawn ()
         $cmdline = $program . $PerlACE::ProcessVX::ExeExt . ' ' . $self->{ARGUMENTS};
         if (defined $self->{ARGUMENTS}) {
             ($arguments = $self->{ARGUMENTS})=~ s/\"/\\\"/g;
+            ($arguments = $self->{ARGUMENTS})=~ s/\'/\\\'/g;
             $arguments = ",\"" . $arguments . "\"";
         }
         @cmds[$cmdnr++] = 'ace_vx_rc = vx_execae(ace_main' . $arguments . ')';