[Ant-contrib-developers] CVS: cpptasks/src/net/sf/antcontrib/cpptasks/types DefineArgument.java,1.4,1.5

[Curt A. <ca...@us...>]

Update of /cvsroot/ant-contrib/cpptasks/src/net/sf/antcontrib/cpptasks/types
In directory usw-pr-cvs1:/tmp/cvs-serv32717/src/net/sf/antcontrib/cpptasks/types

Modified Files:
	DefineArgument.java 
Log Message:
JDK 1.1 fixes


Index: DefineArgument.java
===================================================================
RCS file: /cvsroot/ant-contrib/cpptasks/src/net/sf/antcontrib/cpptasks/types/DefineArgument.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** DefineArgument.java	8 Mar 2002 08:20:33 -0000	1.4
--- DefineArgument.java	9 Mar 2002 04:42:27 -0000	1.5
***************
*** 206,213 ****
      public static DefineArgument[] merge(DefineArgument[] base, DefineArgument[] override) {
        if(base.length == 0) {
!         return (DefineArgument[]) override.clone();
        }
        if(override.length == 0) {
!         return (DefineArgument[]) base.clone();
        }
        Vector unduplicated = new Vector(base.length);
--- 206,215 ----
      public static DefineArgument[] merge(DefineArgument[] base, DefineArgument[] override) {
        if(base.length == 0) {
! 		DefineArgument[] overrideClone = (DefineArgument[]) override.clone();
!         return overrideClone;
        }
        if(override.length == 0) {
! 		DefineArgument[] baseClone = (DefineArgument[]) base.clone();
!         return baseClone;
        }
        Vector unduplicated = new Vector(base.length);