summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorschmidt <douglascraigschmidt@users.noreply.github.com>2001-07-02 11:43:00 +0000
committerschmidt <douglascraigschmidt@users.noreply.github.com>2001-07-02 11:43:00 +0000
commitf518557f573b1a2302d7f0b9a86b13dbae916de8 (patch)
tree079b79afb50319787a51e9ec8f0390619ce88bd9
parente5c65857bec00930b2f0245dc7defca8c9317678 (diff)
downloadATCD-f518557f573b1a2302d7f0b9a86b13dbae916de8.tar.gz
ChangeLogTag:Mon Jul 2 05:40:54 2001 Douglas C. Schmidt <schmidt@tango.doc.wustl.edu>
-rw-r--r--ChangeLog13
-rw-r--r--ChangeLogs/ChangeLog-02a13
-rw-r--r--ChangeLogs/ChangeLog-03a13
-rw-r--r--THANKS2
-rw-r--r--ace/Refcounted_Auto_Ptr.h8
-rw-r--r--ace/Refcounted_Auto_Ptr.i14
-rw-r--r--ace/SPIPE_Addr.cpp2
-rw-r--r--ace/config-macosx.h5
-rw-r--r--include/makeinclude/platform_macosx.GNU2
9 files changed, 71 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index f036af2bcf9..5f329d73baf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,18 @@
Mon Jul 2 05:40:54 2001 Douglas C. Schmidt <schmidt@tango.doc.wustl.edu>
+ * ace/SPIPE_Addr.cpp (set): Added a "+ 1" to the computation of
+ the size of the SPIPE_Addr to account for the trailing NUL.
+ Thanks to Oren Zeev-Ben-Mordehai <oren@phonedo.com> for
+ reporting this.
+
+ * ace/Refcounted_Auto_Ptr.{h,i}: Added support for a "null()"
+ method to check if a refcounted auto ptr is NULL. Thanks to
+ Jenny Kowald <jkowald@oz.agile.tv> for reporting this.
+
+ * ace/config-macosx.h,
+ * ace/platform_macosx.GNU: Enhanced these files to support MacOSX.
+ Thanks to John Zorko <j.zorko@att.net> for contributing this.
+
* ace/Synch.h: Fixed the Doxygen documentation for all the
removed_ fields, which where somehow messed up. Thanks to
Johnny Willemsen for reporting this.
diff --git a/ChangeLogs/ChangeLog-02a b/ChangeLogs/ChangeLog-02a
index f036af2bcf9..5f329d73baf 100644
--- a/ChangeLogs/ChangeLog-02a
+++ b/ChangeLogs/ChangeLog-02a
@@ -1,5 +1,18 @@
Mon Jul 2 05:40:54 2001 Douglas C. Schmidt <schmidt@tango.doc.wustl.edu>
+ * ace/SPIPE_Addr.cpp (set): Added a "+ 1" to the computation of
+ the size of the SPIPE_Addr to account for the trailing NUL.
+ Thanks to Oren Zeev-Ben-Mordehai <oren@phonedo.com> for
+ reporting this.
+
+ * ace/Refcounted_Auto_Ptr.{h,i}: Added support for a "null()"
+ method to check if a refcounted auto ptr is NULL. Thanks to
+ Jenny Kowald <jkowald@oz.agile.tv> for reporting this.
+
+ * ace/config-macosx.h,
+ * ace/platform_macosx.GNU: Enhanced these files to support MacOSX.
+ Thanks to John Zorko <j.zorko@att.net> for contributing this.
+
* ace/Synch.h: Fixed the Doxygen documentation for all the
removed_ fields, which where somehow messed up. Thanks to
Johnny Willemsen for reporting this.
diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a
index f036af2bcf9..5f329d73baf 100644
--- a/ChangeLogs/ChangeLog-03a
+++ b/ChangeLogs/ChangeLog-03a
@@ -1,5 +1,18 @@
Mon Jul 2 05:40:54 2001 Douglas C. Schmidt <schmidt@tango.doc.wustl.edu>
+ * ace/SPIPE_Addr.cpp (set): Added a "+ 1" to the computation of
+ the size of the SPIPE_Addr to account for the trailing NUL.
+ Thanks to Oren Zeev-Ben-Mordehai <oren@phonedo.com> for
+ reporting this.
+
+ * ace/Refcounted_Auto_Ptr.{h,i}: Added support for a "null()"
+ method to check if a refcounted auto ptr is NULL. Thanks to
+ Jenny Kowald <jkowald@oz.agile.tv> for reporting this.
+
+ * ace/config-macosx.h,
+ * ace/platform_macosx.GNU: Enhanced these files to support MacOSX.
+ Thanks to John Zorko <j.zorko@att.net> for contributing this.
+
* ace/Synch.h: Fixed the Doxygen documentation for all the
removed_ fields, which where somehow messed up. Thanks to
Johnny Willemsen for reporting this.
diff --git a/THANKS b/THANKS
index cbdfb235c58..47690640f40 100644
--- a/THANKS
+++ b/THANKS
@@ -1276,6 +1276,8 @@ David Trusty <david.trusty@westwave.com>
Burkhard Neppert <b.neppert@dr-staedtler.de>
Crawford Lodge <crawford.lodge@xmlglobal.com>
Scott Gaa <scott_a_gaa@md.northgrum.com>
+Jenny Kowald <jkowald@oz.agile.tv>
+Oren Zeev-Ben-Mordehai <oren@phonedo.com>
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/Refcounted_Auto_Ptr.h b/ace/Refcounted_Auto_Ptr.h
index 5a9cdaca991..f1207185f25 100644
--- a/ace/Refcounted_Auto_Ptr.h
+++ b/ace/Refcounted_Auto_Ptr.h
@@ -86,6 +86,11 @@ public:
/// Get the pointer value.
X *get (void);
+ // = Utility method.
+
+ /// Allows us to check for NULL on all ACE_Refcounted_Auto_Ptr objects.
+ int null (void) const;
+
/// Declare the dynamic allocation hooks.
ACE_ALLOC_HOOK_DECLARE;
@@ -163,6 +168,9 @@ private:
ACE_LOCK lock_;
private:
+ /// Allows us to check for NULL on all ACE_Refcounted_Auto_Ptr objects.
+ int null (void) const;
+
// = Constructor and destructor private.
ACE_Refcounted_Auto_Ptr_Rep (X *p = 0);
~ACE_Refcounted_Auto_Ptr_Rep (void);
diff --git a/ace/Refcounted_Auto_Ptr.i b/ace/Refcounted_Auto_Ptr.i
index 1a22f66bdc0..07d723a85d5 100644
--- a/ace/Refcounted_Auto_Ptr.i
+++ b/ace/Refcounted_Auto_Ptr.i
@@ -5,6 +5,20 @@
#include "Synch_T.h"
+template <class X, class ACE_LOCK> inline int
+ACE_Refcounted_Auto_Ptr_Rep<X, ACE_LOCK>::null (void) const
+{
+ ACE_GUARD_RETURN (ACE_LOCK, guard, const_cast<ACE_LOCK&>(this->lock_), 0);
+
+ return this->ptr_.get() == 0;
+}
+
+template <class X, class ACE_LOCK> inline int
+ACE_Refcounted_Auto_Ptr<X, ACE_LOCK>::null (void) const
+{
+ return this->rep_->null ();
+}
+
template <class X, class ACE_LOCK> inline ACE_Refcounted_Auto_Ptr_Rep<X, ACE_LOCK> *
ACE_Refcounted_Auto_Ptr_Rep<X, ACE_LOCK>::create (X *p)
{
diff --git a/ace/SPIPE_Addr.cpp b/ace/SPIPE_Addr.cpp
index 22b6c8473a3..b8e7b491d2d 100644
--- a/ace/SPIPE_Addr.cpp
+++ b/ace/SPIPE_Addr.cpp
@@ -120,7 +120,7 @@ ACE_SPIPE_Addr::set (const ACE_TCHAR *addr,
ACE_OS::strcpy (this->SPIPE_addr_.rendezvous_, temp);
#else
this->ACE_Addr::base_set (AF_SPIPE,
- ACE_OS::strlen (addr) + len);
+ ACE_OS::strlen (addr) + 1 + len);
ACE_OS::strncpy (this->SPIPE_addr_.rendezvous_,
addr,
sizeof this->SPIPE_addr_.rendezvous_);
diff --git a/ace/config-macosx.h b/ace/config-macosx.h
index 9d9d9c938e8..5636b4927bb 100644
--- a/ace/config-macosx.h
+++ b/ace/config-macosx.h
@@ -5,6 +5,7 @@
#ifndef ACE_CONFIG_H
#define ACE_CONFIG_H
+
#if ! defined (__ACE_INLINE__)
#define __ACE_INLINE__
#endif /* ! __ACE_INLINE__ */
@@ -32,6 +33,7 @@
#define ACE_HAS_SVR4_TLI
+//#define ACE_HAS_CLOCK_GETTIME
#define ACE_HAS_MEMCHR
// Compiler/platform defines the sig_atomic_t typedef.
@@ -158,9 +160,12 @@
#define ACE_HAS_THREAD_SPECIFIC_STORAGE
#define ACE_HAS_DIRENT
+
#define ACE_LACKS_SETSCHED
+//#define ACE_HAS_TANDEM_SIGNALS
//#define ACE_HAS_RECURSIVE_MUTEXES
+
#define ACE_HAS_TERM_IOCTLS
#define ACE_USES_HIGH_BAUD_RATES
#define TCGETS TIOCGETA
diff --git a/include/makeinclude/platform_macosx.GNU b/include/makeinclude/platform_macosx.GNU
index f75a1195c0d..160f737a98a 100644
--- a/include/makeinclude/platform_macosx.GNU
+++ b/include/makeinclude/platform_macosx.GNU
@@ -2,6 +2,7 @@
# platform_macosx.GNU
# preliminary support for Mac OS X DP4, some stuff still doesn't work.
+
CC = cc
CXX = c++
CFLAGS += -Wall -Wpointer-arith -pipe
@@ -16,3 +17,4 @@ RANLIB = ranlib
SOEXT = dylib
SOFLAGS = -dynamic
SOBUILD = -o $(VSHDIR)$*.dylib $<
+