summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbrunsch <brunsch@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2000-12-07 03:55:00 +0000
committerbrunsch <brunsch@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2000-12-07 03:55:00 +0000
commitfb2d816f3cbc7a4c55f5f0c80c657bca13efe705 (patch)
tree8eb6323e826fa9adcbc79b3cd4060b380a1df84e
parenteae5d2058121f2c825e75e3fefcd2074d6147e7e (diff)
downloadATCD-fb2d816f3cbc7a4c55f5f0c80c657bca13efe705.tar.gz
ChangeLogTag:Wed Dec 06 19:52:42 2000 Darrell Brunsch <brunsch@uci.edu>
-rw-r--r--ChangeLog6
-rw-r--r--ChangeLogs/ChangeLog-02a6
-rw-r--r--ChangeLogs/ChangeLog-03a6
-rw-r--r--ace/Auto_Ptr.i14
4 files changed, 26 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index 21e131e0c5d..39abeda94c1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Wed Dec 06 19:52:42 2000 Darrell Brunsch <brunsch@uci.edu>
+
+ * ace/Auto_Ptr.i:
+
+ Added a couple of ACE_INLINEs and an include of Synch_T.h.
+
Wed Dec 06 20:12:35 2000 Irfan Pyarali <irfan@cs.wustl.edu>
* ace/Containers_T.cpp (operator=): In case the existing array is
diff --git a/ChangeLogs/ChangeLog-02a b/ChangeLogs/ChangeLog-02a
index 21e131e0c5d..39abeda94c1 100644
--- a/ChangeLogs/ChangeLog-02a
+++ b/ChangeLogs/ChangeLog-02a
@@ -1,3 +1,9 @@
+Wed Dec 06 19:52:42 2000 Darrell Brunsch <brunsch@uci.edu>
+
+ * ace/Auto_Ptr.i:
+
+ Added a couple of ACE_INLINEs and an include of Synch_T.h.
+
Wed Dec 06 20:12:35 2000 Irfan Pyarali <irfan@cs.wustl.edu>
* ace/Containers_T.cpp (operator=): In case the existing array is
diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a
index 21e131e0c5d..39abeda94c1 100644
--- a/ChangeLogs/ChangeLog-03a
+++ b/ChangeLogs/ChangeLog-03a
@@ -1,3 +1,9 @@
+Wed Dec 06 19:52:42 2000 Darrell Brunsch <brunsch@uci.edu>
+
+ * ace/Auto_Ptr.i:
+
+ Added a couple of ACE_INLINEs and an include of Synch_T.h.
+
Wed Dec 06 20:12:35 2000 Irfan Pyarali <irfan@cs.wustl.edu>
* ace/Containers_T.cpp (operator=): In case the existing array is
diff --git a/ace/Auto_Ptr.i b/ace/Auto_Ptr.i
index 53b5f1db51e..85f54bfc834 100644
--- a/ace/Auto_Ptr.i
+++ b/ace/Auto_Ptr.i
@@ -3,6 +3,8 @@
// Auto_Ptr.i
+#include "Synch_T.h"
+
template<class X> ACE_INLINE
ACE_Auto_Basic_Ptr<X>::ACE_Auto_Basic_Ptr (ACE_Auto_Basic_Ptr<X> &rhs)
: p_ (rhs.release ())
@@ -142,14 +144,14 @@ ACE_Auto_Array_Ptr<X>::operator->() const
return this->get ();
}
-template <class X, class ACE_LOCK> ACE_Refcounted_Auto_Ptr_Rep<X, ACE_LOCK> *
+template <class X, class ACE_LOCK> ACE_INLINE ACE_Refcounted_Auto_Ptr_Rep<X, ACE_LOCK> *
ACE_Refcounted_Auto_Ptr_Rep<X, ACE_LOCK>::create (X *p)
{
// Yes set ref count to zero.
return new ACE_Refcounted_Auto_Ptr_Rep<X, ACE_LOCK> (p);
}
-template <class X, class ACE_LOCK> ACE_Refcounted_Auto_Ptr_Rep<X, ACE_LOCK> *
+template <class X, class ACE_LOCK> ACE_INLINE ACE_Refcounted_Auto_Ptr_Rep<X, ACE_LOCK> *
ACE_Refcounted_Auto_Ptr_Rep<X, ACE_LOCK>::attach (ACE_Refcounted_Auto_Ptr_Rep<X, ACE_LOCK>*& rep)
{
ACE_ASSERT (rep != 0);
@@ -161,7 +163,7 @@ ACE_Refcounted_Auto_Ptr_Rep<X, ACE_LOCK>::attach (ACE_Refcounted_Auto_Ptr_Rep<X,
return rep;
}
-template <class X, class ACE_LOCK> void
+template <class X, class ACE_LOCK> ACE_INLINE void
ACE_Refcounted_Auto_Ptr_Rep<X, ACE_LOCK>::detach (ACE_Refcounted_Auto_Ptr_Rep<X, ACE_LOCK>*& rep)
{
ACE_ASSERT (rep != 0);
@@ -175,7 +177,7 @@ ACE_Refcounted_Auto_Ptr_Rep<X, ACE_LOCK>::detach (ACE_Refcounted_Auto_Ptr_Rep<X,
delete rep;
}
-template <class X, class ACE_LOCK> void
+template <class X, class ACE_LOCK> ACE_INLINE void
ACE_Refcounted_Auto_Ptr_Rep<X, ACE_LOCK>::assign (ACE_Refcounted_Auto_Ptr_Rep<X, ACE_LOCK>*& rep, ACE_Refcounted_Auto_Ptr_Rep<X, ACE_LOCK>* new_rep)
{
ACE_ASSERT (rep != 0);
@@ -194,14 +196,14 @@ ACE_Refcounted_Auto_Ptr_Rep<X, ACE_LOCK>::assign (ACE_Refcounted_Auto_Ptr_Rep<X,
delete old;
}
-template <class X, class ACE_LOCK>
+template <class X, class ACE_LOCK> ACE_INLINE
ACE_Refcounted_Auto_Ptr_Rep<X, ACE_LOCK>::ACE_Refcounted_Auto_Ptr_Rep (X *p)
: ptr_ (p),
ref_count_ (0)
{
}
-template <class X, class ACE_LOCK>
+template <class X, class ACE_LOCK> ACE_INLINE
ACE_Refcounted_Auto_Ptr_Rep<X, ACE_LOCK>::~ACE_Refcounted_Auto_Ptr_Rep (void)
{
}