ChangeLogTag: Mon Jan 10 15:37:22 2000 Irfan Pyarali <irfan@cs.wustl.edu>

5 files changed, 90 insertions, 58 deletions

diff --git a/ChangeLog b/ChangeLog
index bc459f9b820..5689d4a0b96 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,11 +1,17 @@
+Mon Jan 10 15:37:22 2000  Irfan Pyarali  <irfan@cs.wustl.edu>
+
+	* ace/Pair_T: Added const accessors to the pair class.  Also,
+	  changed the Reference_Pair accessors to be const.  Thanks to
+	  Serge Kolgan <skolgan@cisco.com> for reporting this.
+
 Sun Jan  9 00:25:58 2000  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
 
 	* ace/Process.i (setreugid): Added an ACE_UNUSED_ARG for the
 	  ACE_LACKS_PWD_FUNCTIONS case.  Thanks to David for catching
 	  this!
-  
+
 	* ace/Process.i (setreugid): Guard against the case where
-	  ACE_LACKS_PWD_FUNCTIONS.  Thanks to David Levine for 
+	  ACE_LACKS_PWD_FUNCTIONS.  Thanks to David Levine for
 	  reporting this problem with VxWorks.
 
 	* ace/Pair_T.h: Reformatted to conform to the ACE style.
@@ -24,7 +30,7 @@ Sat Jan  8 09:44:51 2000  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
  	  returning.  Thanks to Valery Arkhangorodsky
  	  <valerya@servicesoft.com> for suggesting this.
 
-	* ace/OS.i: Needed to add an extern "C" {} block around the 
+	* ace/OS.i: Needed to add an extern "C" {} block around the
 	  setregid() and setreuid() functions.  Thanks to David Levine
 	  for reporting this.
 
@@ -34,25 +40,25 @@ Fri Jan  7 20:01:48 2000  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
 	  ace/config-sunos5.5.h: Some platforms seem to lack function
  	  prototypes for setreuid() and setregid(), even though they are
  	  in the library.  Therefore, I've added
-  
- 	  #define ACE_LACKS_SETREGID_PROTOTYPE 
-  
-	  and 
-  
+
+ 	  #define ACE_LACKS_SETREGID_PROTOTYPE
+
+	  and
+
 	  #define ACE_LACKS_SETREUID_PROTOTYPE
-  
+
           macros to handle this case.
-  
-	* ace/Process: Added support to allow UNIX applications to 
+
+	* ace/Process: Added support to allow UNIX applications to
 	  automagically set the real and effective user/group ids when
  	  ACE_Process::spawn() is called.  Thanks to Craig Perras
  	  <cperras@watchguard.com> for contributing this.
 
-	* ace: Updated the following files to include 
-  
+	* ace: Updated the following files to include
+
           #define ACE_LACKS_SETREGID
 	  #define ACE_LACKS_SETREUID
-  
+
           config-chorus.h
 	  config-cray.h:168
 	  config-cygwin32-common.h
@@ -64,10 +70,10 @@ Fri Jan  7 20:01:48 2000  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
 	  config-sunos4-g++.h
 	  config-sunos4-sun4.1.4.h
 	  config-win32-common.h
-  
+
           Ideally, Ossama's autoconf stuff will auto-detect anything that
  	  I'm missing.
-    
+
 	* ace/OS: Added wrapper facade methods for setregid() and
 	  setregid().
 
diff --git a/ChangeLogs/ChangeLog-02a b/ChangeLogs/ChangeLog-02a
index bc459f9b820..5689d4a0b96 100644
--- a/ChangeLogs/ChangeLog-02a
+++ b/ChangeLogs/ChangeLog-02a
@@ -1,11 +1,17 @@
+Mon Jan 10 15:37:22 2000  Irfan Pyarali  <irfan@cs.wustl.edu>
+
+	* ace/Pair_T: Added const accessors to the pair class.  Also,
+	  changed the Reference_Pair accessors to be const.  Thanks to
+	  Serge Kolgan <skolgan@cisco.com> for reporting this.
+
 Sun Jan  9 00:25:58 2000  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
 
 	* ace/Process.i (setreugid): Added an ACE_UNUSED_ARG for the
 	  ACE_LACKS_PWD_FUNCTIONS case.  Thanks to David for catching
 	  this!
-  
+
 	* ace/Process.i (setreugid): Guard against the case where
-	  ACE_LACKS_PWD_FUNCTIONS.  Thanks to David Levine for 
+	  ACE_LACKS_PWD_FUNCTIONS.  Thanks to David Levine for
 	  reporting this problem with VxWorks.
 
 	* ace/Pair_T.h: Reformatted to conform to the ACE style.
@@ -24,7 +30,7 @@ Sat Jan  8 09:44:51 2000  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
  	  returning.  Thanks to Valery Arkhangorodsky
  	  <valerya@servicesoft.com> for suggesting this.
 
-	* ace/OS.i: Needed to add an extern "C" {} block around the 
+	* ace/OS.i: Needed to add an extern "C" {} block around the
 	  setregid() and setreuid() functions.  Thanks to David Levine
 	  for reporting this.
 
@@ -34,25 +40,25 @@ Fri Jan  7 20:01:48 2000  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
 	  ace/config-sunos5.5.h: Some platforms seem to lack function
  	  prototypes for setreuid() and setregid(), even though they are
  	  in the library.  Therefore, I've added
-  
- 	  #define ACE_LACKS_SETREGID_PROTOTYPE 
-  
-	  and 
-  
+
+ 	  #define ACE_LACKS_SETREGID_PROTOTYPE
+
+	  and
+
 	  #define ACE_LACKS_SETREUID_PROTOTYPE
-  
+
           macros to handle this case.
-  
-	* ace/Process: Added support to allow UNIX applications to 
+
+	* ace/Process: Added support to allow UNIX applications to
 	  automagically set the real and effective user/group ids when
  	  ACE_Process::spawn() is called.  Thanks to Craig Perras
  	  <cperras@watchguard.com> for contributing this.
 
-	* ace: Updated the following files to include 
-  
+	* ace: Updated the following files to include
+
           #define ACE_LACKS_SETREGID
 	  #define ACE_LACKS_SETREUID
-  
+
           config-chorus.h
 	  config-cray.h:168
 	  config-cygwin32-common.h
@@ -64,10 +70,10 @@ Fri Jan  7 20:01:48 2000  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
 	  config-sunos4-g++.h
 	  config-sunos4-sun4.1.4.h
 	  config-win32-common.h
-  
+
           Ideally, Ossama's autoconf stuff will auto-detect anything that
  	  I'm missing.
-    
+
 	* ace/OS: Added wrapper facade methods for setregid() and
 	  setregid().
 
diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a
index bc459f9b820..5689d4a0b96 100644
--- a/ChangeLogs/ChangeLog-03a
+++ b/ChangeLogs/ChangeLog-03a
@@ -1,11 +1,17 @@
+Mon Jan 10 15:37:22 2000  Irfan Pyarali  <irfan@cs.wustl.edu>
+
+	* ace/Pair_T: Added const accessors to the pair class.  Also,
+	  changed the Reference_Pair accessors to be const.  Thanks to
+	  Serge Kolgan <skolgan@cisco.com> for reporting this.
+
 Sun Jan  9 00:25:58 2000  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
 
 	* ace/Process.i (setreugid): Added an ACE_UNUSED_ARG for the
 	  ACE_LACKS_PWD_FUNCTIONS case.  Thanks to David for catching
 	  this!
-  
+
 	* ace/Process.i (setreugid): Guard against the case where
-	  ACE_LACKS_PWD_FUNCTIONS.  Thanks to David Levine for 
+	  ACE_LACKS_PWD_FUNCTIONS.  Thanks to David Levine for
 	  reporting this problem with VxWorks.
 
 	* ace/Pair_T.h: Reformatted to conform to the ACE style.
@@ -24,7 +30,7 @@ Sat Jan  8 09:44:51 2000  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
  	  returning.  Thanks to Valery Arkhangorodsky
  	  <valerya@servicesoft.com> for suggesting this.
 
-	* ace/OS.i: Needed to add an extern "C" {} block around the 
+	* ace/OS.i: Needed to add an extern "C" {} block around the
 	  setregid() and setreuid() functions.  Thanks to David Levine
 	  for reporting this.
 
@@ -34,25 +40,25 @@ Fri Jan  7 20:01:48 2000  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
 	  ace/config-sunos5.5.h: Some platforms seem to lack function
  	  prototypes for setreuid() and setregid(), even though they are
  	  in the library.  Therefore, I've added
-  
- 	  #define ACE_LACKS_SETREGID_PROTOTYPE 
-  
-	  and 
-  
+
+ 	  #define ACE_LACKS_SETREGID_PROTOTYPE
+
+	  and
+
 	  #define ACE_LACKS_SETREUID_PROTOTYPE
-  
+
           macros to handle this case.
-  
-	* ace/Process: Added support to allow UNIX applications to 
+
+	* ace/Process: Added support to allow UNIX applications to
 	  automagically set the real and effective user/group ids when
  	  ACE_Process::spawn() is called.  Thanks to Craig Perras
  	  <cperras@watchguard.com> for contributing this.
 
-	* ace: Updated the following files to include 
-  
+	* ace: Updated the following files to include
+
           #define ACE_LACKS_SETREGID
 	  #define ACE_LACKS_SETREUID
-  
+
           config-chorus.h
 	  config-cray.h:168
 	  config-cygwin32-common.h
@@ -64,10 +70,10 @@ Fri Jan  7 20:01:48 2000  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
 	  config-sunos4-g++.h
 	  config-sunos4-sun4.1.4.h
 	  config-win32-common.h
-  
+
           Ideally, Ossama's autoconf stuff will auto-detect anything that
  	  I'm missing.
-    
+
 	* ace/OS: Added wrapper facade methods for setregid() and
 	  setregid().
 
diff --git a/ace/Pair_T.h b/ace/Pair_T.h
index cb329cf391b..7e67cbf2e4f 100644
--- a/ace/Pair_T.h
+++ b/ace/Pair_T.h
@@ -26,7 +26,7 @@
 template <class T1, class T2>
 class ACE_Pair
 {
-  // = TITLE  
+  // = TITLE
   //     Defines a pair.
   //
   // = DESCRIPTION
@@ -38,7 +38,7 @@ public:
   typedef T2 second_type;
 
   // = Initialization and termination methods.
-  ACE_Pair (const T1 &t1, 
+  ACE_Pair (const T1 &t1,
             const T2 &t2);
   // Constructor.
 
@@ -46,10 +46,12 @@ public:
   // Default constructor.
 
   T1 &first (void);
+  const T1 &first (void) const;
   void first (const T1 &t1);
   // Get/Set first.
 
   T2 &second (void);
+  const T2 &second (void) const;
   void second (const T2 &t2);
   // Access second.
 
@@ -62,7 +64,7 @@ protected:
 template <class T1, class T2>
 class ACE_Reference_Pair
 {
-  // = TITLE  
+  // = TITLE
   //     Defines a pair that only hold references.
   //
   // = DESCRIPTION
@@ -75,14 +77,14 @@ public:
   typedef T2 second_type;
 
   // = Initialization and termination methods.
-  ACE_Reference_Pair (T1 &t1, 
+  ACE_Reference_Pair (T1 &t1,
                       T2 &t2);
   // Constructor.
 
-  T1 &first (void);
+  T1 &first (void) const;
   // Access first.
 
-  T2 &second (void);
+  T2 &second (void) const;
   // Access second.
 
 protected:
diff --git a/ace/Pair_T.i b/ace/Pair_T.i
index ecb8a1a50b7..7ef61c9cf44 100644
--- a/ace/Pair_T.i
+++ b/ace/Pair_T.i
@@ -1,7 +1,7 @@
 // $Id$
 
 template <class T1, class T2> ACE_INLINE
-ACE_Pair<T1, T2>::ACE_Pair (const T1 &t1, 
+ACE_Pair<T1, T2>::ACE_Pair (const T1 &t1,
                             const T2 &t2)
   : first_ (t1),
     second_ (t2)
@@ -19,6 +19,12 @@ ACE_Pair<T1, T2>::first (void)
   return this->first_;
 }
 
+template <class T1, class T2> ACE_INLINE const T1 &
+ACE_Pair<T1, T2>::first (void) const
+{
+  return this->first_;
+}
+
 template <class T1, class T2> ACE_INLINE void
 ACE_Pair<T1, T2>::first (const T1 &t1)
 {
@@ -31,6 +37,12 @@ ACE_Pair<T1, T2>::second (void)
   return this->second_;
 }
 
+template <class T1, class T2> ACE_INLINE const T2 &
+ACE_Pair<T1, T2>::second (void) const
+{
+  return this->second_;
+}
+
 template <class T1, class T2> ACE_INLINE void
 ACE_Pair<T1, T2>::second (const T2 &t2)
 {
@@ -38,7 +50,7 @@ ACE_Pair<T1, T2>::second (const T2 &t2)
 }
 
 template <class T1, class T2> ACE_INLINE
-ACE_Reference_Pair<T1, T2>::ACE_Reference_Pair (T1 &t1, 
+ACE_Reference_Pair<T1, T2>::ACE_Reference_Pair (T1 &t1,
                                                 T2 &t2)
   : first_ (t1),
     second_ (t2)
@@ -46,13 +58,13 @@ ACE_Reference_Pair<T1, T2>::ACE_Reference_Pair (T1 &t1,
 }
 
 template <class T1, class T2> ACE_INLINE T1 &
-ACE_Reference_Pair<T1, T2>::first (void)
+ACE_Reference_Pair<T1, T2>::first (void) const
 {
   return this->first_;
 }
 
 template <class T1, class T2> ACE_INLINE T2 &
-ACE_Reference_Pair<T1, T2>::second (void)
+ACE_Reference_Pair<T1, T2>::second (void) const
 {
   return this->second_;
 }