Merged revisions 81160,81162-81166 via svnmerge from

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

........
  r81160 | johnnyw | 2008-03-31 03:42:12 -0500 (Mon, 31 Mar 2008) | 1 line
........
  r81162 | johnnyw | 2008-03-31 04:00:40 -0500 (Mon, 31 Mar 2008) | 1 line
  
  Mon Mar 31 08:59:57 UTC 2008  Johnny Willemsen  <jwillemsen@remedy.nl>
........
  r81163 | johnnyw | 2008-03-31 06:00:50 -0500 (Mon, 31 Mar 2008) | 1 line
  
  Mon Mar 31 11:00:57 UTC 2008  Johnny Willemsen  <jwillemsen@remedy.nl>
........
  r81164 | elliott_c | 2008-03-31 07:09:34 -0500 (Mon, 31 Mar 2008) | 1 line
  
  ChangeLogTag: Mon Mar 31 12:09:20 UTC 2008  Chad Elliott  <elliott_c@ociweb.com>
........
  r81165 | iliyan | 2008-03-31 08:51:57 -0500 (Mon, 31 Mar 2008) | 1 line
  
  ChangeLogTag: Mon Mar 31 13:50:45 UTC 2008  Iliyan Jeliazkov  <iliyan@ociweb.com>
........
  r81166 | iliyan | 2008-03-31 10:00:23 -0500 (Mon, 31 Mar 2008) | 1 line
  
  ChangeLogTag: Mon Mar 31 14:52:58 UTC 2008  Iliyan Jeliazkov  <iliyan@ociweb.com>
........

12 files changed, 80 insertions, 5 deletions

diff --git a/ACE/ChangeLog b/ACE/ChangeLog
index a644b819c54..2a091c4ed32 100644
--- a/ACE/ChangeLog
+++ b/ACE/ChangeLog
@@ -1,3 +1,39 @@
+Mon Mar 31 14:52:58 UTC 2008  Iliyan Jeliazkov  <iliyan@ociweb.com>
+
+        * ace/Intrusive_Auto_Ptr.h:
+        * ace/Intrusive_Auto_Ptr.cpp:
+        * ace/Refcounted_Auto_Ptr.h:
+        * ace/Refcounted_Auto_Ptr.inl:
+        * ace/Refcounted_Auto_Ptr.cpp:
+
+          Added preprocessor guards for proper inlining. Qualified
+          the type name in the implementation of opretator
+          unspecified_bool_type () to appease GCC 3.x
+
+Mon Mar 31 13:50:45 UTC 2008  Iliyan Jeliazkov  <iliyan@ociweb.com>
+
+        * tests/run_test.lst:
+
+          Adding Intrusive_Auto_Ptr_Test to the list
+
+Mon Mar 31 12:09:20 UTC 2008  Chad Elliott  <elliott_c@ociweb.com>
+
+        * bin/MakeProjectCreator/modules/AutomakeWorkspaceHelper.pm:
+
+          Always reference Kokyu libraries from $(ACE_BUILDDIR) instead of
+          $(top_builddir) so that it will work from both ACE and TAO.
+
+Mon Mar 31 11:00:57 UTC 2008  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tests/Bug_2980_Regression_Dll.cpp:
+        * tests/Bug_2980_Regression_Test.cpp:
+          Fixed fuzz errors
+
+Mon Mar 31 08:59:57 UTC 2008  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tests/OS_Test.cpp:
+          Added test for ACE_OS::last_error()
+
 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
diff --git a/ACE/THANKS b/ACE/THANKS
index b2d402e0aab..67176a9e03a 100644
--- a/ACE/THANKS
+++ b/ACE/THANKS
@@ -2240,6 +2240,7 @@ Andi Heusser <aheusser at gmail dot com>
 Paul Carter <pcarter at scires dot com>
 Michael Carter <mcarter at swri dot org>
 Alain Kocelniak <alain at corys dot fr>
+Alvaro Vega Garcia <avega at tid dot es>
 
 I would particularly like to thank Paul Stephenson, who worked with me
 at Ericsson in the early 1990's.  Paul devised the recursive Makefile
diff --git a/ACE/ace/Intrusive_Auto_Ptr.cpp b/ACE/ace/Intrusive_Auto_Ptr.cpp
index ebfb25847b4..bb8dcbaab11 100644
--- a/ACE/ace/Intrusive_Auto_Ptr.cpp
+++ b/ACE/ace/Intrusive_Auto_Ptr.cpp
@@ -3,9 +3,12 @@
 #ifndef ACE_INTRUSIVE_AUTO_PTR_CPP
 #define ACE_INTRUSIVE_AUTO_PTR_CPP
 
-
 #include "ace/Intrusive_Auto_Ptr.h"
 
+#if !defined (__ACE_INLINE__)
+#include "ace/Intrusive_Auto_Ptr.inl"
+#endif /* __ACE_INLINE __ */
+
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 template <class X>
diff --git a/ACE/ace/Intrusive_Auto_Ptr.h b/ACE/ace/Intrusive_Auto_Ptr.h
index 482aff5dde0..987acf9c750 100644
--- a/ACE/ace/Intrusive_Auto_Ptr.h
+++ b/ACE/ace/Intrusive_Auto_Ptr.h
@@ -145,7 +145,9 @@ bool operator!=(T * a, ACE_Intrusive_Auto_Ptr<U> const & b);
 
 ACE_END_VERSIONED_NAMESPACE_DECL
 
+#if defined (__ACE_INLINE__)
 #include "ace/Intrusive_Auto_Ptr.inl"
+#endif /* __ACE_INLINE __ */
 
 #if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
 #include "ace/Intrusive_Auto_Ptr.cpp"
diff --git a/ACE/ace/Refcounted_Auto_Ptr.cpp b/ACE/ace/Refcounted_Auto_Ptr.cpp
index 7dd9d862b64..78dd941b744 100644
--- a/ACE/ace/Refcounted_Auto_Ptr.cpp
+++ b/ACE/ace/Refcounted_Auto_Ptr.cpp
@@ -5,6 +5,10 @@
 
 #include "ace/Refcounted_Auto_Ptr.h"
 
+#if !defined (__ACE_INLINE__)
+#include "ace/Refcounted_Auto_Ptr.inl"
+#endif /* __ACE_INLINE __ */
+
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 template <class X, class ACE_LOCK>
diff --git a/ACE/ace/Refcounted_Auto_Ptr.h b/ACE/ace/Refcounted_Auto_Ptr.h
index 68afed45a0a..ae7db0727bb 100644
--- a/ACE/ace/Refcounted_Auto_Ptr.h
+++ b/ACE/ace/Refcounted_Auto_Ptr.h
@@ -199,7 +199,9 @@ public:
 
 ACE_END_VERSIONED_NAMESPACE_DECL
 
+#if defined (__ACE_INLINE__)
 #include "ace/Refcounted_Auto_Ptr.inl"
+#endif /* __ACE_INLINE __ */
 
 #if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
 #include "ace/Refcounted_Auto_Ptr.cpp"
diff --git a/ACE/ace/Refcounted_Auto_Ptr.inl b/ACE/ace/Refcounted_Auto_Ptr.inl
index 07d699451cc..20f0af5aca4 100644
--- a/ACE/ace/Refcounted_Auto_Ptr.inl
+++ b/ACE/ace/Refcounted_Auto_Ptr.inl
@@ -95,7 +95,7 @@ ACE_Refcounted_Auto_Ptr<X, ACE_LOCK>::ACE_Refcounted_Auto_Ptr (X *p)
 }
 
 template <class X, class ACE_LOCK> inline
-ACE_Refcounted_Auto_Ptr<X, ACE_LOCK>::operator unspecified_bool_type() const
+ACE_Refcounted_Auto_Ptr<X, ACE_LOCK>::operator typename ACE_Refcounted_Auto_Ptr<X, ACE_LOCK>::unspecified_bool_type () const
 {
   return null() ? 0: unspecified_bool;
 }
diff --git a/ACE/bin/MakeProjectCreator/modules/AutomakeWorkspaceHelper.pm b/ACE/bin/MakeProjectCreator/modules/AutomakeWorkspaceHelper.pm
index 7b7b30a0186..ba29bdb40f9 100644
--- a/ACE/bin/MakeProjectCreator/modules/AutomakeWorkspaceHelper.pm
+++ b/ACE/bin/MakeProjectCreator/modules/AutomakeWorkspaceHelper.pm
@@ -135,7 +135,7 @@ sub modify_libpath {
         $reldir = 'Kokyu';
       }
     }
-    $str =~ s!$libname!\$(top_builddir)/$reldir/$libname!;
+    $str =~ s!$libname!\$(ACE_BUILDDIR)/$reldir/$libname!;
     return $str;
   }
   elsif ($libname =~ /^lib(tao|kokyu)/i) {
diff --git a/ACE/tests/Bug_2980_Regression_Dll.cpp b/ACE/tests/Bug_2980_Regression_Dll.cpp
index cd1a594af04..280f9d87be5 100644
--- a/ACE/tests/Bug_2980_Regression_Dll.cpp
+++ b/ACE/tests/Bug_2980_Regression_Dll.cpp
@@ -1,3 +1,5 @@
+// $Id$
+
 #include "ace/Init_ACE.h"
 #include "ace/OS.h"
 #include "ace/Log_Msg.h"
diff --git a/ACE/tests/Bug_2980_Regression_Test.cpp b/ACE/tests/Bug_2980_Regression_Test.cpp
index feef1836c8b..61ecb617c9e 100644
--- a/ACE/tests/Bug_2980_Regression_Test.cpp
+++ b/ACE/tests/Bug_2980_Regression_Test.cpp
@@ -1,3 +1,5 @@
+// $Id$
+
 #include <iostream>
 #include <assert.h>
 
@@ -100,7 +102,7 @@ int main(int argc, char ** argv)
 
 #  ifdef USE_THREAD
   pthread_t tid1;
-  result = pthread_create(&tid1, NULL, &loadDll, 0);
+  result = pthread_create(&tid1, 0, &loadDll, 0);
   if (result != 0)
   {
     printf ("pthread_create() failed: %d\n", result);
@@ -115,7 +117,7 @@ int main(int argc, char ** argv)
 
 #  ifdef USE_THREAD
   pthread_t tid2;
-  result = pthread_create(&tid2, NULL, &unloadDll, 0);
+  result = pthread_create(&tid2, 0, &unloadDll, 0);
   if (result != 0)
   {
     printf ("pthread_create() failed: %d\n", result);
diff --git a/ACE/tests/OS_Test.cpp b/ACE/tests/OS_Test.cpp
index 1b4438a67b8..1d6665dba89 100644
--- a/ACE/tests/OS_Test.cpp
+++ b/ACE/tests/OS_Test.cpp
@@ -947,6 +947,25 @@ cpu_info_test (void)
 }
 
 int
+last_error_test (void)
+{
+  ACE_DEBUG ((LM_DEBUG,
+              ACE_TEXT ("Testing last_error method\n")));
+
+  ACE_OS::last_error (ETIME);
+
+  int const l_error = ACE_OS::last_error ();
+  if (l_error != ETIME)
+    {
+      ACE_ERROR ((LM_ERROR, ACE_TEXT ("Last error returned %d instead of ETIME"),
+                            l_error));
+      return 1;
+    }
+
+  ACE_OS::last_error (0);
+}
+
+int
 pagesize_test (void)
 {
   ACE_DEBUG ((LM_DEBUG,
@@ -1029,6 +1048,9 @@ run_main (int, ACE_TCHAR *[])
   if ((result = log2_test ()) != 0)
       status = result;
 
+  if ((result = last_error_test ()) != 0)
+      status = result;
+
   ACE_END_TEST;
   return status;
 }
diff --git a/ACE/tests/run_test.lst b/ACE/tests/run_test.lst
index 9969313c38f..573faf4faa4 100644
--- a/ACE/tests/run_test.lst
+++ b/ACE/tests/run_test.lst
@@ -76,6 +76,7 @@ High_Res_Timer_Test: !ACE_FOR_TAO
 INET_Addr_Test: !NO_NETWORK
 IOStream_Test
 Integer_Truncate_Test
+Intrusive_Auto_Ptr_Test
 Lazy_Map_Manager_Test
 Log_Msg_Test: !ACE_FOR_TAO
 Log_Msg_Backend_Test: !ACE_FOR_TAO