summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorschmidt <douglascraigschmidt@users.noreply.github.com>1999-07-27 02:21:40 +0000
committerschmidt <douglascraigschmidt@users.noreply.github.com>1999-07-27 02:21:40 +0000
commit9f71d50e04577948d6cc9842edea4881e4bd7c41 (patch)
tree148dc79976181ab1513bfb10834fdbef9735034a
parentedb55b0aded30c090e649d78394937b4a48a1f0f (diff)
downloadATCD-9f71d50e04577948d6cc9842edea4881e4bd7c41.tar.gz
ChangeLogTag:Mon Jul 26 20:50:37 1999 Douglas C. Schmidt <schmidt@tango.cs.wustl.edu>
-rw-r--r--ChangeLog-99b10
-rw-r--r--THANKS1
-rw-r--r--ace/Future.h10
3 files changed, 15 insertions, 6 deletions
diff --git a/ChangeLog-99b b/ChangeLog-99b
index 1d6eaedab18..1a141095fd4 100644
--- a/ChangeLog-99b
+++ b/ChangeLog-99b
@@ -1,8 +1,16 @@
+Mon Jul 26 20:50:37 1999 Douglas C. Schmidt <schmidt@tango.cs.wustl.edu>
+
+ * ace/Future.h: Moved the static methods until the bottom
+ of the ACE_Future_Rep class (again) to workaround a bug with
+ Borland's C++ Builder. Thanks to Christopher Kohlhoff
+ <chris@kohlhoff.com> for reporting this (again).
+
Mon Jul 26 20:59:23 1999 Carlos O'Ryan <coryan@cs.wustl.edu>
* websvcs/README:
Added a brief description of the directory and its current
- contents.
+ contents. Thanks to Will Skunk <willskunk@homemail.com>
+ for motivating this.
Mon Jul 26 20:50:37 1999 Douglas C. Schmidt <schmidt@tango.cs.wustl.edu>
diff --git a/THANKS b/THANKS
index a854b371d33..169fe2ef6e4 100644
--- a/THANKS
+++ b/THANKS
@@ -698,6 +698,7 @@ Roger Egbers <regbers@isrglobal.com>
Ralf Kluthe <kluthe@iti.mu-luebeck.de>
Ruud Diterwich<R.M.L.Diterwich@marin.nl>
Bill Nesbitt <bnesbitt@magellan.com>
+Will Skunk <willskunk@homemail.com>
I would particularly like to thank Paul Stephenson, who worked with me
at Ericsson. Paul devised the recursive Makefile scheme that
diff --git a/ace/Future.h b/ace/Future.h
index df014f98567..0fae99ee716 100644
--- a/ace/Future.h
+++ b/ace/Future.h
@@ -41,7 +41,6 @@ class ACE_Export ACE_Future_Holder
{
// = TITLE
// Implementation of object which has holds ACE_Future.
-
public:
ACE_Future_Holder (const ACE_Future<T> &future);
~ACE_Future_Holder (void);
@@ -169,10 +168,6 @@ private:
//
// Precondition (rep != 0 && new_rep != 0)
- // = Constructor and destructor private
- ACE_Future_Rep (void);
- ~ACE_Future_Rep (void);
-
int ready (void);
// Is result available?
@@ -194,6 +189,11 @@ private:
// = Condition variable and mutex that protect the <value_>.
ACE_Condition_Thread_Mutex value_ready_;
ACE_Thread_Mutex value_ready_mutex_;
+
+private:
+ // = Constructor and destructor private.
+ ACE_Future_Rep (void);
+ ~ACE_Future_Rep (void);
};
template <class T>