summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorparsons <parsons@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2006-06-21 14:14:53 +0000
committerparsons <parsons@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2006-06-21 14:14:53 +0000
commitb560ad1f84a0068e7ed3b4c61098afe223c51cda (patch)
tree035de3178f5de35a5a74ac2d26ec6e6490d625e1
parentea77050e5a855449e571521f90623d35a2eb8588 (diff)
downloadATCD-b560ad1f84a0068e7ed3b4c61098afe223c51cda.tar.gz
ChangeLogTag: Wed Jun 21 14:10:38 UTC 2006 Jeff Parsons <j.parsons@vanderbilt.edu>
-rw-r--r--TAO/ChangeLog8
-rw-r--r--TAO/tao/Array_VarOut_T.h2
2 files changed, 9 insertions, 1 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index a9adcd920a8..19f81e87f04 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,11 @@
+Wed Jun 21 14:10:38 UTC 2006 Jeff Parsons <j.parsons@vanderbilt.edu>
+
+ * tao/Array_VarOut_T.h:
+
+ Removed 'typename' qualifier in typedef of FORANY inside the
+ TAO_Array_Var_Base_T template class, since it was causing
+ problems on the FC4_CIAO_Core build.
+
Wed Jun 21 13:50:57 UTC 2006 Jeff Parsons <j.parsons@vanderbilt.edu>
* orbsvcs/orbsvcs/SSLIOP/SSLIOP_Credentials.h:
diff --git a/TAO/tao/Array_VarOut_T.h b/TAO/tao/Array_VarOut_T.h
index 7102e3ac017..3d34d37440e 100644
--- a/TAO/tao/Array_VarOut_T.h
+++ b/TAO/tao/Array_VarOut_T.h
@@ -122,7 +122,7 @@ public:
// TAO extension.
_retn_type ptr (void) const;
protected:
- typedef typename TAO_Array_Forany_T<T,T_slice,TAG> FORANY;
+ typedef TAO_Array_Forany_T<T,T_slice,TAG> FORANY;
_slice_type * ptr_;
};