summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorirfan <irfan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>1999-04-02 03:17:48 +0000
committerirfan <irfan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>1999-04-02 03:17:48 +0000
commit6507bc1fee7f018e130a9ed0496d9ab9e552ec61 (patch)
tree61d17ecc529441ef579f4d835651837eb791e2df
parent7132d6a010c1b9dbe893b202a257b97648878573 (diff)
downloadATCD-6507bc1fee7f018e130a9ed0496d9ab9e552ec61.tar.gz
*** empty log message ***
-rw-r--r--ChangeLog-99b6
-rw-r--r--TAO/tao/Sequence.h14
2 files changed, 15 insertions, 5 deletions
diff --git a/ChangeLog-99b b/ChangeLog-99b
index 70b1a57ddd0..35253b79c6a 100644
--- a/ChangeLog-99b
+++ b/ChangeLog-99b
@@ -1,4 +1,8 @@
-Thu Apr 01 20:46:55 1999 Irfan Pyarali <irfan@cs.wustl.edu>
+Thu Apr 01 21:09:00 1999 Irfan Pyarali <irfan@cs.wustl.edu>
+
+ * Sequence.h (TAO_Base_Sequence): Made the copy constructor and
+ the assignment operator public since making them protected was
+ breaking some compilers.
* ace/Filecache.cpp (ACE_Filecache_Object): Fixed typo: <lock_>
should be <lock>.
diff --git a/TAO/tao/Sequence.h b/TAO/tao/Sequence.h
index 879f6682292..becea24117f 100644
--- a/TAO/tao/Sequence.h
+++ b/TAO/tao/Sequence.h
@@ -85,17 +85,23 @@ protected:
void *buffer);
// Assume ownership and set length to 0.
+ // = orbos/98-01-11 proposed extensions.
+ CORBA::Boolean release (void) const;
+ // Returns the state of the sequence release flag.
+
+public:
+
+ // = The following two functions should be protected but we made it
+ // public because it breaks some compilers.
+
TAO_Base_Sequence (const TAO_Base_Sequence &rhs);
TAO_Base_Sequence &operator= (const TAO_Base_Sequence &rhs);
// Copy constructor and assignment operator are protected, the
// derived classes must provided the right semantics for the buffer
// copy, only the static fields are actually copy.
- // = orbos/98-01-11 proposed extensions.
- CORBA::Boolean release (void) const;
- // Returns the state of the sequence release flag.
-
protected:
+
CORBA::ULong maximum_;
// The maximum number of elements the buffer can contain.