santuario-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From blaut...@apache.org
Subject cvs commit: xml-security/c/src/utils XSECDOMUtils.hpp XSECNameSpaceExpander.hpp XSECPlatformUtils.cpp XSECPlatformUtils.hpp XSECSafeBuffer.hpp XSECSafeBufferFormatter.cpp XSECXPathNodeList.hpp
Date Sat, 22 Feb 2003 08:47:26 GMT
blautenb    2003/02/22 00:47:26

  Modified:    c/src    configure configure.ac
               c/src/canon XSECC14n20010315.cpp
               c/src/dsig DSIGConstants.hpp DSIGKeyInfoList.cpp
                        DSIGKeyInfoX509.cpp DSIGReference.cpp
                        DSIGSignature.cpp DSIGSignedInfo.hpp
                        DSIGTransformBase64.hpp DSIGTransformC14n.cpp
                        DSIGTransformC14n.hpp DSIGTransformEnvelope.hpp
                        DSIGTransformXSL.hpp
               c/src/enc XSECKeyInfoResolverDefault.cpp
               c/src/enc/OpenSSL OpenSSLCryptoKeyDSA.cpp
                        OpenSSLCryptoKeyRSA.cpp OpenSSLCryptoProvider.cpp
                        OpenSSLCryptoX509.cpp
               c/src/framework XSECConfig.hpp.in XSECURIResolver.hpp
                        XSECURIResolverXerces.hpp
               c/src/samples IOStreamOutputter.hpp
               c/src/tools/c14n c14n.cpp
               c/src/tools/checksig checksig.cpp
               c/src/tools/templatesign templatesign.cpp
               c/src/tools/txfmout txfmout.cpp
               c/src/tools/xtest xtest.cpp
               c/src/transformers TXFMBase.cpp TXFMBase.hpp TXFMBase64.hpp
                        TXFMC14n.hpp TXFMOutputFile.cpp TXFMOutputFile.hpp
                        TXFMSB.cpp TXFMSB.hpp TXFMSHA1.hpp TXFMURL.cpp
                        TXFMURL.hpp TXFMXPath.cpp TXFMXSL.cpp TXFMXSL.hpp
               c/src/utils XSECDOMUtils.hpp XSECNameSpaceExpander.hpp
                        XSECPlatformUtils.cpp XSECPlatformUtils.hpp
                        XSECSafeBuffer.hpp XSECSafeBufferFormatter.cpp
                        XSECXPathNodeList.hpp
  Log:
  Update to support gcc 3.2
  
  Revision  Changes    Path
  1.4       +148 -142  xml-security/c/src/configure
  
  Index: configure
  ===================================================================
  RCS file: /home/cvs/xml-security/c/src/configure,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- configure	20 Feb 2003 10:35:57 -0000	1.3
  +++ configure	22 Feb 2003 08:47:23 -0000	1.4
  @@ -2544,78 +2544,9 @@
   
   package_version_major=`echo ${PACKAGE_VERSION} | ${AWK} -F '.' '{print $1}'`
   
  +# "cache" the check for gcc -E
   
  -# Checks for required libraries
  -
  -
  -echo "$as_me:$LINENO: checking for floor in -lm" >&5
  -echo $ECHO_N "checking for floor in -lm... $ECHO_C" >&6
  -if test "${ac_cv_lib_m_floor+set}" = set; then
  -  echo $ECHO_N "(cached) $ECHO_C" >&6
  -else
  -  ac_check_lib_save_LIBS=$LIBS
  -LIBS="-lm  $LIBS"
  -cat >conftest.$ac_ext <<_ACEOF
  -#line $LINENO "configure"
  -#include "confdefs.h"
   
  -/* Override any gcc2 internal prototype to avoid an error.  */
  -#ifdef __cplusplus
  -extern "C"
  -#endif
  -/* We use char because int might match the return type of a gcc2
  -   builtin and then its argument prototype would still apply.  */
  -char floor ();
  -#ifdef F77_DUMMY_MAIN
  -#  ifdef __cplusplus
  -     extern "C"
  -#  endif
  -   int F77_DUMMY_MAIN() { return 1; }
  -#endif
  -int
  -main ()
  -{
  -floor ();
  -  ;
  -  return 0;
  -}
  -_ACEOF
  -rm -f conftest.$ac_objext conftest$ac_exeext
  -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
  -  (eval $ac_link) 2>&5
  -  ac_status=$?
  -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
  -  (exit $ac_status); } &&
  -         { ac_try='test -s conftest$ac_exeext'
  -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
  -  (eval $ac_try) 2>&5
  -  ac_status=$?
  -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
  -  (exit $ac_status); }; }; then
  -  ac_cv_lib_m_floor=yes
  -else
  -  echo "$as_me: failed program was:" >&5
  -cat conftest.$ac_ext >&5
  -ac_cv_lib_m_floor=no
  -fi
  -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
  -LIBS=$ac_check_lib_save_LIBS
  -fi
  -echo "$as_me:$LINENO: result: $ac_cv_lib_m_floor" >&5
  -echo "${ECHO_T}$ac_cv_lib_m_floor" >&6
  -if test $ac_cv_lib_m_floor = yes; then
  -  cat >>confdefs.h <<_ACEOF
  -#define HAVE_LIBM 1
  -_ACEOF
  -
  -  LIBS="-lm $LIBS"
  -
  -fi
  -
  -
  -# Determine the host system and Makefile fragment
  -
  -# Check for required includes
   ac_ext=c
   ac_cpp='$CPP $CPPFLAGS'
   ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  @@ -2817,6 +2748,106 @@
   ac_compiler_gnu=$ac_cv_c_compiler_gnu
   
   
  +cat >conftest.$ac_ext <<_ACEOF
  +#line $LINENO "configure"
  +#include "confdefs.h"
  +
  +_ACEOF
  +if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
  +  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
  +  ac_status=$?
  +  egrep -v '^ *\+' conftest.er1 >conftest.err
  +  rm -f conftest.er1
  +  cat conftest.err >&5
  +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
  +  (exit $ac_status); } >/dev/null; then
  +  if test -s conftest.err; then
  +    ac_cpp_err=$ac_c_preproc_warn_flag
  +  else
  +    ac_cpp_err=
  +  fi
  +else
  +  ac_cpp_err=yes
  +fi
  +if test -z "$ac_cpp_err"; then
  +  :
  +else
  +  echo "$as_me: failed program was:" >&5
  +  cat conftest.$ac_ext >&5
  +
  +fi
  +rm -f conftest.err conftest.$ac_ext
  +
  +# Checks for required libraries
  +
  +echo "$as_me:$LINENO: checking for floor in -lm" >&5
  +echo $ECHO_N "checking for floor in -lm... $ECHO_C" >&6
  +if test "${ac_cv_lib_m_floor+set}" = set; then
  +  echo $ECHO_N "(cached) $ECHO_C" >&6
  +else
  +  ac_check_lib_save_LIBS=$LIBS
  +LIBS="-lm  $LIBS"
  +cat >conftest.$ac_ext <<_ACEOF
  +#line $LINENO "configure"
  +#include "confdefs.h"
  +
  +/* Override any gcc2 internal prototype to avoid an error.  */
  +#ifdef __cplusplus
  +extern "C"
  +#endif
  +/* We use char because int might match the return type of a gcc2
  +   builtin and then its argument prototype would still apply.  */
  +char floor ();
  +#ifdef F77_DUMMY_MAIN
  +#  ifdef __cplusplus
  +     extern "C"
  +#  endif
  +   int F77_DUMMY_MAIN() { return 1; }
  +#endif
  +int
  +main ()
  +{
  +floor ();
  +  ;
  +  return 0;
  +}
  +_ACEOF
  +rm -f conftest.$ac_objext conftest$ac_exeext
  +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
  +  (eval $ac_link) 2>&5
  +  ac_status=$?
  +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
  +  (exit $ac_status); } &&
  +         { ac_try='test -s conftest$ac_exeext'
  +  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
  +  (eval $ac_try) 2>&5
  +  ac_status=$?
  +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
  +  (exit $ac_status); }; }; then
  +  ac_cv_lib_m_floor=yes
  +else
  +  echo "$as_me: failed program was:" >&5
  +cat conftest.$ac_ext >&5
  +ac_cv_lib_m_floor=no
  +fi
  +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
  +LIBS=$ac_check_lib_save_LIBS
  +fi
  +echo "$as_me:$LINENO: result: $ac_cv_lib_m_floor" >&5
  +echo "${ECHO_T}$ac_cv_lib_m_floor" >&6
  +if test $ac_cv_lib_m_floor = yes; then
  +  cat >>confdefs.h <<_ACEOF
  +#define HAVE_LIBM 1
  +_ACEOF
  +
  +  LIBS="-lm $LIBS"
  +
  +fi
  +
  +
  +# Determine the host system and Makefile fragment
  +
  +# Check for required includes
   echo "$as_me:$LINENO: checking for ANSI C header files" >&5
   echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6
   if test "${ac_cv_header_stdc+set}" = set; then
  @@ -3251,46 +3282,16 @@
   
   # Find Xerces
   
  -# First "cache" the check for gcc -E
  -
  -cat >conftest.$ac_ext <<_ACEOF
  -#line $LINENO "configure"
  -#include "confdefs.h"
  -
  -_ACEOF
  -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
  -  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
  -  ac_status=$?
  -  egrep -v '^ *\+' conftest.er1 >conftest.err
  -  rm -f conftest.er1
  -  cat conftest.err >&5
  -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
  -  (exit $ac_status); } >/dev/null; then
  -  if test -s conftest.err; then
  -    ac_cpp_err=$ac_c_preproc_warn_flag
  -  else
  -    ac_cpp_err=
  -  fi
  -else
  -  ac_cpp_err=yes
  -fi
  -if test -z "$ac_cpp_err"; then
  -  :
  -else
  -  echo "$as_me: failed program was:" >&5
  -  cat conftest.$ac_ext >&5
  -
  -fi
  -rm -f conftest.err conftest.$ac_ext
  -
   # Check for Xerces using XERCESCROOT (override any system version)
   
  -OLDCPPFLAGS=$CPPFLAGS
  -CPPFLAGS="${CPPFLAGS} -I${XERCESCROOT}/src"
  +if test $XERCESCROOT; then
  +
  +  OLDCPPFLAGS=$CPPFLAGS
  +  CPPFLAGS="${CPPFLAGS} -I${XERCESCROOT}/src"
   
  -echo "$as_me:$LINENO: checking for Xerces 2.x headers in XERCESCROOT/src" >&5
  +  echo "$as_me:$LINENO: checking for Xerces 2.x headers in XERCESCROOT/src" >&5
   echo $ECHO_N "checking for Xerces 2.x headers in XERCESCROOT/src... $ECHO_C" >&6
  -if test "$cross_compiling" = yes; then
  +  if test "$cross_compiling" = yes; then
     { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling" >&5
   echo "$as_me: error: cannot run test program while cross compiling" >&2;}
      { (exit 1); exit 1; }; }
  @@ -3299,12 +3300,12 @@
   #line $LINENO "configure"
   #include "confdefs.h"
   #include <xercesc/util/XercesVersion.hpp>
  -int main(int argc, char **argv) {
  -if (XERCES_VERSION_MAJOR < 2)
  -return 1;
  -else
  -return 0;
  -}
  +    int main(int argc, char **argv) {
  +      if (XERCES_VERSION_MAJOR < 2)
  +        return 1;
  +      else
  +        return 0;
  +    }
   _ACEOF
   rm -f conftest$ac_exeext
   if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
  @@ -3318,8 +3319,8 @@
     echo "$as_me:$LINENO: \$? = $ac_status" >&5
     (exit $ac_status); }; }; then
     LDFLAGS="${LDFLAGS} -L${XERCESCROOT}/lib -lxerces-c"
  -xerces_found=yes
  -echo "$as_me:$LINENO: result: found" >&5
  +    xerces_found=yes
  +    echo "$as_me:$LINENO: result: found" >&5
   echo "${ECHO_T}found" >&6
   else
     echo "$as_me: program exited with status $ac_status" >&5
  @@ -3327,20 +3328,22 @@
   cat conftest.$ac_ext >&5
   ( exit $ac_status )
   CPPFLAGS=$OLD_CPPFLAGS
  -echo "$as_me:$LINENO: result: no" >&5
  +    echo "$as_me:$LINENO: result: no" >&5
   echo "${ECHO_T}no" >&6
   fi
   rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
   fi
   
  +fi
  +
   if test -z $xerces_found ; then
   
  -# Xerces was not found
  +  # Xerces was not found
   
  -echo "$as_me:$LINENO: checking for Xerces 2.x headers in system includes" >&5
  +  echo "$as_me:$LINENO: checking for Xerces 2.x headers in system includes" >&5
   echo $ECHO_N "checking for Xerces 2.x headers in system includes... $ECHO_C" >&6
   
  -if test "$cross_compiling" = yes; then
  +  if test "$cross_compiling" = yes; then
     { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling" >&5
   echo "$as_me: error: cannot run test program while cross compiling" >&2;}
      { (exit 1); exit 1; }; }
  @@ -3349,12 +3352,12 @@
   #line $LINENO "configure"
   #include "confdefs.h"
   #include <xercesc/util/XercesVersion.hpp>
  -int main(int argc, char **argv) {
  -if (XERCES_VERSION_MAJOR < 2)
  -return 1;
  -else
  -return 0;
  -}
  +    int main(int argc, char **argv) {
  +      if (XERCES_VERSION_MAJOR < 2)
  +        return 1;
  +      else
  +        return 0;
  +    }
   _ACEOF
   rm -f conftest$ac_exeext
   if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
  @@ -3368,7 +3371,7 @@
     echo "$as_me:$LINENO: \$? = $ac_status" >&5
     (exit $ac_status); }; }; then
     LDFLAGS="${LDFLAGS} -lxerces-c"
  -echo "$as_me:$LINENO: result: found" >&5
  +    echo "$as_me:$LINENO: result: found" >&5
   echo "${ECHO_T}found" >&6
   else
     echo "$as_me: program exited with status $ac_status" >&5
  @@ -3388,13 +3391,15 @@
   
   if test "$use_xalan" = "yes" ; then
   
  -echo "$as_me:$LINENO: checking for Xalan headers in XALANCROOT" >&5
  +  if test $XALANCROOT; then
  +
  +    echo "$as_me:$LINENO: checking for Xalan headers in XALANCROOT" >&5
   echo $ECHO_N "checking for Xalan headers in XALANCROOT... $ECHO_C" >&6
   
  -OLD_CPPFLAGS=$CPPFLAGS
  -CPPFLAGS="${CPPFLAGS} -I${XALANCROOT}/src"
  +    OLD_CPPFLAGS=$CPPFLAGS
  +    CPPFLAGS="${CPPFLAGS} -I${XALANCROOT}/src"
   
  -cat >conftest.$ac_ext <<_ACEOF
  +    cat >conftest.$ac_ext <<_ACEOF
   #line $LINENO "configure"
   #include "confdefs.h"
   #include <Include/PlatformDefinitions.hpp>
  @@ -3417,24 +3422,25 @@
   fi
   if test -z "$ac_cpp_err"; then
     xalan_found=yes
  -   LDFLAGS="${LDFLAGS} -L${XALANCROOT}/lib -lxalan-c1_5_0"
  -   echo "$as_me:$LINENO: result: found" >&5
  +      LDFLAGS="${LDFLAGS} -L${XALANCROOT}/lib -lxalan-c1_5_0"
  +      echo "$as_me:$LINENO: result: found" >&5
   echo "${ECHO_T}found" >&6
   else
     echo "$as_me: failed program was:" >&5
     cat conftest.$ac_ext >&5
     CPPFLAGS=$OLD_CPPFLAGS
  -   echo "$as_me:$LINENO: result: no" >&5
  +      echo "$as_me:$LINENO: result: no" >&5
   echo "${ECHO_T}no" >&6
   fi
   rm -f conftest.err conftest.$ac_ext;
   
  +  fi
   
  -if test -z $xalan_found ; then
  +  if test -z $xalan_found ; then
   
  -echo "$as_me:$LINENO: checking for Xalan in system includes" >&5
  +    echo "$as_me:$LINENO: checking for Xalan in system includes" >&5
   echo $ECHO_N "checking for Xalan in system includes... $ECHO_C" >&6
  -cat >conftest.$ac_ext <<_ACEOF
  +    cat >conftest.$ac_ext <<_ACEOF
   #line $LINENO "configure"
   #include "confdefs.h"
   #include <Include/PlatformDefinitions.hpp>
  @@ -3457,8 +3463,8 @@
   fi
   if test -z "$ac_cpp_err"; then
     xalan_found=yes
  -   LDFLAGS="${LDFLAGS} -lxalan-c1_5_0"
  -   echo "$as_me:$LINENO: result: found" >&5
  +      LDFLAGS="${LDFLAGS} -lxalan-c1_5_0"
  +      echo "$as_me:$LINENO: result: found" >&5
   echo "${ECHO_T}found" >&6
   else
     echo "$as_me: failed program was:" >&5
  @@ -3467,20 +3473,20 @@
   #define XSEC_NO_XALAN 1
   _ACEOF
   
  -   echo "$as_me:$LINENO: result: no - WARNING - configuring for no Xalan" >&5
  +      echo "$as_me:$LINENO: result: no - WARNING - configuring for no Xalan" >&5
   echo "${ECHO_T}no - WARNING - configuring for no Xalan" >&6
   fi
   rm -f conftest.err conftest.$ac_ext;
   
  -fi
  +  fi
   
   else
   
  -# NO_XALAN is defined - so we skip
  +  # NO_XALAN is defined - so we skip
   
  -{ echo "$as_me:$LINENO: Warning - Xalan being configured out - XPath and XSLT will not be available" >&5
  +  { echo "$as_me:$LINENO: Warning - Xalan being configured out - XPath and XSLT will not be available" >&5
   echo "$as_me: Warning - Xalan being configured out - XPath and XSLT will not be available" >&6;}
  -cat >>confdefs.h <<\_ACEOF
  +  cat >>confdefs.h <<\_ACEOF
   #define XSEC_NO_XALAN 1
   _ACEOF
   
  
  
  
  1.4       +60 -54    xml-security/c/src/configure.ac
  
  Index: configure.ac
  ===================================================================
  RCS file: /home/cvs/xml-security/c/src/configure.ac,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- configure.ac	20 Feb 2003 10:35:57 -0000	1.3
  +++ configure.ac	22 Feb 2003 08:47:23 -0000	1.4
  @@ -141,6 +141,9 @@
   
   package_version_major=`echo ${PACKAGE_VERSION} | ${AWK} -F '.' '{print $1}'`
   
  +# "cache" the check for gcc -E
  +
  +AC_TRY_CPP()
   
   # Checks for required libraries
   AC_CHECK_LIB(m, floor)
  @@ -218,45 +221,45 @@
   
   # Find Xerces
   
  -# First "cache" the check for gcc -E
  +# Check for Xerces using XERCESCROOT (override any system version)
   
  -AC_TRY_CPP()
  +if test $XERCESCROOT; then
   
  -# Check for Xerces using XERCESCROOT (override any system version)
  +  OLDCPPFLAGS=$CPPFLAGS
  +  CPPFLAGS=["${CPPFLAGS} -I${XERCESCROOT}/src"]
   
  -OLDCPPFLAGS=$CPPFLAGS
  -CPPFLAGS=["${CPPFLAGS} -I${XERCESCROOT}/src"]
  +  AC_MSG_CHECKING([for Xerces 2.x headers in XERCESCROOT/src])
  +  AC_TRY_RUN([#include <xercesc/util/XercesVersion.hpp>
  +    int main(int argc, char **argv) {
  +      if (XERCES_VERSION_MAJOR < 2)
  +        return 1;
  +      else
  +        return 0;
  +    }],
  +    LDFLAGS="${LDFLAGS} -L${XERCESCROOT}/lib -lxerces-c"
  +    xerces_found=yes
  +    [AC_MSG_RESULT([found])],
  +    CPPFLAGS=$OLD_CPPFLAGS
  +    [AC_MSG_RESULT([no])])
   
  -AC_MSG_CHECKING([for Xerces 2.x headers in XERCESCROOT/src])
  -AC_TRY_RUN([#include <xercesc/util/XercesVersion.hpp>
  -int main(int argc, char **argv) {
  -if (XERCES_VERSION_MAJOR < 2)
  -return 1;
  -else
  -return 0;
  -}],
  -LDFLAGS="${LDFLAGS} -L${XERCESCROOT}/lib -lxerces-c"
  -xerces_found=yes
  -[AC_MSG_RESULT([found])],
  -CPPFLAGS=$OLD_CPPFLAGS
  -[AC_MSG_RESULT([no])])
  +fi
   
   if test -z $xerces_found ; then
   
  -# Xerces was not found
  +  # Xerces was not found
   
  -AC_MSG_CHECKING([for Xerces 2.x headers in system includes])
  +  AC_MSG_CHECKING([for Xerces 2.x headers in system includes])
   
  -AC_TRY_RUN([#include <xercesc/util/XercesVersion.hpp>
  -int main(int argc, char **argv) {
  -if (XERCES_VERSION_MAJOR < 2)
  -return 1;
  -else
  -return 0;
  -}],
  -LDFLAGS="${LDFLAGS} -lxerces-c"
  -[AC_MSG_RESULT([found])],
  -[AC_MSG_ERROR([Xerces 2.0 not found.  Ensure XERCESCROOT points to base directory of Xerces and Xerces 2.0 or later is available])])
  +  AC_TRY_RUN([#include <xercesc/util/XercesVersion.hpp>
  +    int main(int argc, char **argv) {
  +      if (XERCES_VERSION_MAJOR < 2)
  +        return 1;
  +      else
  +        return 0;
  +    }],
  +    LDFLAGS="${LDFLAGS} -lxerces-c"
  +    [AC_MSG_RESULT([found])],
  +    [AC_MSG_ERROR([Xerces 2.0 not found.  Ensure XERCESCROOT points to base directory of Xerces and Xerces 2.0 or later is available])])
   
   fi
   
  @@ -264,37 +267,40 @@
   
   if test "$use_xalan" = "yes" ; then
   
  -AC_MSG_CHECKING([for Xalan headers in XALANCROOT])
  +  if test $XALANCROOT; then
   
  -OLD_CPPFLAGS=$CPPFLAGS
  -CPPFLAGS=["${CPPFLAGS} -I${XALANCROOT}/src"]
  +    AC_MSG_CHECKING([for Xalan headers in XALANCROOT])
   
  -AC_TRY_CPP([#include <Include/PlatformDefinitions.hpp>], 
  -   xalan_found=yes 
  -   LDFLAGS="${LDFLAGS} -L${XALANCROOT}/lib -lxalan-c1_5_0"
  -   [AC_MSG_RESULT([found])], 
  -   CPPFLAGS=$OLD_CPPFLAGS
  -   [AC_MSG_RESULT([no])]);
  -
  -
  -if test -z $xalan_found ; then
  -
  -AC_MSG_CHECKING([for Xalan in system includes])
  -AC_TRY_CPP([#include <Include/PlatformDefinitions.hpp>], 
  -   xalan_found=yes 
  -   LDFLAGS="${LDFLAGS} -lxalan-c1_5_0"
  -   [AC_MSG_RESULT([found])],
  -   [AC_DEFINE(XSEC_NO_XALAN)] 
  -   [AC_MSG_RESULT([no - WARNING - configuring for no Xalan])]);
  +    OLD_CPPFLAGS=$CPPFLAGS
  +    CPPFLAGS=["${CPPFLAGS} -I${XALANCROOT}/src"]
   
  -fi
  +    AC_TRY_CPP([#include <Include/PlatformDefinitions.hpp>], 
  +      xalan_found=yes 
  +      LDFLAGS="${LDFLAGS} -L${XALANCROOT}/lib -lxalan-c1_5_0"
  +      [AC_MSG_RESULT([found])], 
  +      CPPFLAGS=$OLD_CPPFLAGS
  +      [AC_MSG_RESULT([no])]);
  +
  +  fi
  +
  +  if test -z $xalan_found ; then
  +
  +    AC_MSG_CHECKING([for Xalan in system includes])
  +    AC_TRY_CPP([#include <Include/PlatformDefinitions.hpp>], 
  +      xalan_found=yes 
  +      LDFLAGS="${LDFLAGS} -lxalan-c1_5_0"
  +      [AC_MSG_RESULT([found])],
  +      [AC_DEFINE(XSEC_NO_XALAN)] 
  +      [AC_MSG_RESULT([no - WARNING - configuring for no Xalan])]);
  +
  +  fi
   
   else
   
  -# NO_XALAN is defined - so we skip
  +  # NO_XALAN is defined - so we skip
   
  -AC_MSG_NOTICE([Warning - Xalan being configured out - XPath and XSLT will not be available])
  -AC_DEFINE(XSEC_NO_XALAN)
  +  AC_MSG_NOTICE([Warning - Xalan being configured out - XPath and XSLT will not be available])
  +  AC_DEFINE(XSEC_NO_XALAN)
   
   fi
   
  
  
  
  1.4       +3 -4      xml-security/c/src/canon/XSECC14n20010315.cpp
  
  Index: XSECC14n20010315.cpp
  ===================================================================
  RCS file: /home/cvs/xml-security/c/src/canon/XSECC14n20010315.cpp,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- XSECC14n20010315.cpp	9 Feb 2003 11:26:50 -0000	1.3
  +++ XSECC14n20010315.cpp	22 Feb 2003 08:47:23 -0000	1.4
  @@ -67,11 +67,6 @@
    *
    * $Id$
    *
  - * $Log$
  - * Revision 1.3  2003/02/09 11:26:50  blautenb
  - * Fixed CVS Log/Id
  - *
  - *
    */
   
   //XSEC includes
  @@ -114,7 +109,8 @@
   // General includes
   #include <stdlib.h>
   #include <string.h>
  -#include <iostream.h>
  +
  +#include <iostream>
   
   
   // --------------------------------------------------------------------------------
  
  
  
  1.3       +3 -4      xml-security/c/src/dsig/DSIGConstants.hpp
  
  Index: DSIGConstants.hpp
  ===================================================================
  RCS file: /home/cvs/xml-security/c/src/dsig/DSIGConstants.hpp,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- DSIGConstants.hpp	9 Feb 2003 11:13:47 -0000	1.2
  +++ DSIGConstants.hpp	22 Feb 2003 08:47:23 -0000	1.3
  @@ -64,9 +64,7 @@
    *
    * Author(s): Berin Lautenbach
    *
  - * $ID$
  - *
  - * $LOG$
  + * $Id$
    *
    */
   
  @@ -340,4 +338,5 @@
   
   }
   
  -#endif /* DSIGCONSTANTS_HEADER */
  \ No newline at end of file
  +#endif /* DSIGCONSTANTS_HEADER */
  +
  
  
  
  1.4       +1 -3      xml-security/c/src/dsig/DSIGKeyInfoList.cpp
  
  Index: DSIGKeyInfoList.cpp
  ===================================================================
  RCS file: /home/cvs/xml-security/c/src/dsig/DSIGKeyInfoList.cpp,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- DSIGKeyInfoList.cpp	21 Feb 2003 11:53:06 -0000	1.3
  +++ DSIGKeyInfoList.cpp	22 Feb 2003 08:47:23 -0000	1.4
  @@ -149,8 +149,6 @@
   	if (ki == 0)
   		return false;
   
  -	XSECSafeBufferFormatter *formatter = mp_parentSignature->getSBFormatter();
  -
   	if (strEquals(getDSIGLocalName(ki), "X509Data")) {
   
   		DSIGKeyInfoX509 * k;
  
  
  
  1.3       +3 -7      xml-security/c/src/dsig/DSIGKeyInfoX509.cpp
  
  Index: DSIGKeyInfoX509.cpp
  ===================================================================
  RCS file: /home/cvs/xml-security/c/src/dsig/DSIGKeyInfoX509.cpp,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- DSIGKeyInfoX509.cpp	9 Feb 2003 11:13:47 -0000	1.2
  +++ DSIGKeyInfoX509.cpp	22 Feb 2003 08:47:23 -0000	1.3
  @@ -65,9 +65,7 @@
    *
    * Author(s): Berin Lautenbach
    *
  - * $ID$
  - *
  - * $LOG$
  + * $Id$
    *
    */
   
  @@ -144,8 +142,6 @@
   
   	}
   
  -	XSECSafeBufferFormatter *formatter = mp_parentSignature->getSBFormatter();
  -
   	if (!strEquals(getDSIGLocalName(mp_keyInfoDOMNode), "X509Data")) {
   
   		throw XSECException(XSECException::LoadNonX509);
  @@ -297,7 +293,7 @@
   
   const XMLCh * DSIGKeyInfoX509::getCertificateItem(int item) {
   
  -	if (item >=0 && item < m_X509List.size())
  +	if (item >=0 && (unsigned int) item < m_X509List.size())
   		return m_X509List[item]->mp_encodedX509;
   
   	return 0;
  @@ -435,4 +431,4 @@
   	XSECnew(h, X509Holder);
   	h->mp_encodedX509 = b64Txt->getNodeValue();
   	
  -}
  \ No newline at end of file
  +}
  
  
  
  1.7       +2 -4      xml-security/c/src/dsig/DSIGReference.cpp
  
  Index: DSIGReference.cpp
  ===================================================================
  RCS file: /home/cvs/xml-security/c/src/dsig/DSIGReference.cpp,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- DSIGReference.cpp	21 Feb 2003 11:53:06 -0000	1.6
  +++ DSIGReference.cpp	22 Feb 2003 08:47:23 -0000	1.7
  @@ -104,7 +104,7 @@
   
   XSEC_USING_XERCES(Janitor);
   
  -#include <iostream.h>
  +#include <iostream>
   
   // --------------------------------------------------------------------------------
   //           Some useful strings
  @@ -982,8 +982,6 @@
   							DOMNode *transformsNode,
   							XSECSafeBufferFormatter * formatter,
   							DSIGSignature * sig) {
  -
  -	DOMDocument *d = transformsNode->getOwnerDocument();
   
   	// This is defined as a static function, not because it makes use of any static variables
   	// in the DSIGReference class, but to neatly link it to the other users
  
  
  
  1.6       +2 -2      xml-security/c/src/dsig/DSIGSignature.cpp
  
  Index: DSIGSignature.cpp
  ===================================================================
  RCS file: /home/cvs/xml-security/c/src/dsig/DSIGSignature.cpp,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- DSIGSignature.cpp	21 Feb 2003 11:53:06 -0000	1.5
  +++ DSIGSignature.cpp	22 Feb 2003 08:47:23 -0000	1.6
  @@ -730,7 +730,7 @@
   
   				// A reference to key information held elsewhere
   
  -				const XMLCh * URI;
  +				const XMLCh * URI = NULL;
   				TXFMBase * currentTxfm;
   
   				DOMNamedNodeMap *atts = tmpKI->getAttributes();
  
  
  
  1.3       +2 -4      xml-security/c/src/dsig/DSIGSignedInfo.hpp
  
  Index: DSIGSignedInfo.hpp
  ===================================================================
  RCS file: /home/cvs/xml-security/c/src/dsig/DSIGSignedInfo.hpp,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- DSIGSignedInfo.hpp	9 Feb 2003 11:13:47 -0000	1.2
  +++ DSIGSignedInfo.hpp	22 Feb 2003 08:47:23 -0000	1.3
  @@ -64,9 +64,7 @@
    *
    * Author(s): Berin Lautenbach
    *
  - * $ID$
  - *
  - * $LOG$
  + * $Id$
    *
    */
   
  @@ -153,4 +151,4 @@
   };
   
   
  -#endif /* DSIGSIGNEDINFO_INCLUDE */
  \ No newline at end of file
  +#endif /* DSIGSIGNEDINFO_INCLUDE */
  
  
  
  1.4       +2 -2      xml-security/c/src/dsig/DSIGTransformBase64.hpp
  
  Index: DSIGTransformBase64.hpp
  ===================================================================
  RCS file: /home/cvs/xml-security/c/src/dsig/DSIGTransformBase64.hpp,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- DSIGTransformBase64.hpp	21 Feb 2003 11:53:06 -0000	1.3
  +++ DSIGTransformBase64.hpp	22 Feb 2003 08:47:23 -0000	1.4
  @@ -185,4 +185,4 @@
   	DSIGTransformBase64();
   	DSIGTransformBase64(const DSIGTransformBase64 & theOther);
   
  -};
  \ No newline at end of file
  +};
  
  
  
  1.5       +2 -4      xml-security/c/src/dsig/DSIGTransformC14n.cpp
  
  Index: DSIGTransformC14n.cpp
  ===================================================================
  RCS file: /home/cvs/xml-security/c/src/dsig/DSIGTransformC14n.cpp,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- DSIGTransformC14n.cpp	21 Feb 2003 11:53:06 -0000	1.4
  +++ DSIGTransformC14n.cpp	22 Feb 2003 08:47:23 -0000	1.5
  @@ -64,9 +64,7 @@
    *
    * Author(s): Berin Lautenbach
    *
  - * $ID$
  - *
  - * $LOG$
  + * $Id$
    *
    */
   
  @@ -355,4 +353,4 @@
   		mp_inclNSStr = NULL;
   
   	}
  -}
  \ No newline at end of file
  +}
  
  
  
  1.4       +2 -2      xml-security/c/src/dsig/DSIGTransformC14n.hpp
  
  Index: DSIGTransformC14n.hpp
  ===================================================================
  RCS file: /home/cvs/xml-security/c/src/dsig/DSIGTransformC14n.hpp,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- DSIGTransformC14n.hpp	21 Feb 2003 11:53:06 -0000	1.3
  +++ DSIGTransformC14n.hpp	22 Feb 2003 08:47:23 -0000	1.4
  @@ -253,4 +253,4 @@
   	canonicalizationMethod			m_cMethod;			// The method
   	DOMElement						* mp_inclNSNode;	// Node holding the inclusive Namespaces
   	const XMLCh						* mp_inclNSStr;		// String holding the namespaces							
  -};
  \ No newline at end of file
  +};
  
  
  
  1.4       +2 -2      xml-security/c/src/dsig/DSIGTransformEnvelope.hpp
  
  Index: DSIGTransformEnvelope.hpp
  ===================================================================
  RCS file: /home/cvs/xml-security/c/src/dsig/DSIGTransformEnvelope.hpp,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- DSIGTransformEnvelope.hpp	21 Feb 2003 11:53:06 -0000	1.3
  +++ DSIGTransformEnvelope.hpp	22 Feb 2003 08:47:23 -0000	1.4
  @@ -180,4 +180,4 @@
   	DSIGTransformEnvelope();
   	DSIGTransformEnvelope(const DSIGTransformEnvelope & theOther);
   
  -};
  \ No newline at end of file
  +};
  
  
  
  1.4       +2 -2      xml-security/c/src/dsig/DSIGTransformXSL.hpp
  
  Index: DSIGTransformXSL.hpp
  ===================================================================
  RCS file: /home/cvs/xml-security/c/src/dsig/DSIGTransformXSL.hpp,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- DSIGTransformXSL.hpp	21 Feb 2003 11:53:06 -0000	1.3
  +++ DSIGTransformXSL.hpp	22 Feb 2003 08:47:23 -0000	1.4
  @@ -213,4 +213,4 @@
   
   	DOMNode				* mp_stylesheetNode;
   
  -};
  \ No newline at end of file
  +};
  
  
  
  1.3       +2 -4      xml-security/c/src/enc/XSECKeyInfoResolverDefault.cpp
  
  Index: XSECKeyInfoResolverDefault.cpp
  ===================================================================
  RCS file: /home/cvs/xml-security/c/src/enc/XSECKeyInfoResolverDefault.cpp,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- XSECKeyInfoResolverDefault.cpp	9 Feb 2003 11:13:49 -0000	1.2
  +++ XSECKeyInfoResolverDefault.cpp	22 Feb 2003 08:47:24 -0000	1.3
  @@ -65,9 +65,7 @@
    *
    * Author(s): Berin Lautenbach
    *
  - * $ID$
  - *
  - * $LOG$
  + * $Id$
    *
    */
   
  @@ -189,4 +187,4 @@
   
   	return new XSECKeyInfoResolverDefault();
   
  -}
  \ No newline at end of file
  +}
  
  
  
  1.3       +2 -4      xml-security/c/src/enc/OpenSSL/OpenSSLCryptoKeyDSA.cpp
  
  Index: OpenSSLCryptoKeyDSA.cpp
  ===================================================================
  RCS file: /home/cvs/xml-security/c/src/enc/OpenSSL/OpenSSLCryptoKeyDSA.cpp,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- OpenSSLCryptoKeyDSA.cpp	9 Feb 2003 11:13:49 -0000	1.2
  +++ OpenSSLCryptoKeyDSA.cpp	22 Feb 2003 08:47:24 -0000	1.3
  @@ -64,9 +64,7 @@
    *
    * Author(s): Berin Lautenbach
    *
  - * $ID$
  - *
  - * $LOG$
  + * $Id$
    *
    */
   
  @@ -383,4 +381,4 @@
   
   	return ret;
   
  -}
  \ No newline at end of file
  +}
  
  
  
  1.3       +2 -4      xml-security/c/src/enc/OpenSSL/OpenSSLCryptoKeyRSA.cpp
  
  Index: OpenSSLCryptoKeyRSA.cpp
  ===================================================================
  RCS file: /home/cvs/xml-security/c/src/enc/OpenSSL/OpenSSLCryptoKeyRSA.cpp,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- OpenSSLCryptoKeyRSA.cpp	9 Feb 2003 11:13:50 -0000	1.2
  +++ OpenSSLCryptoKeyRSA.cpp	22 Feb 2003 08:47:24 -0000	1.3
  @@ -64,9 +64,7 @@
    *
    * Author(s): Berin Lautenbach
    *
  - * $ID$
  - *
  - * $LOG$
  + * $Id$
    *
    */
   
  @@ -400,4 +398,4 @@
   
   	return ret;
   
  -}
  \ No newline at end of file
  +}
  
  
  
  1.3       +2 -4      xml-security/c/src/enc/OpenSSL/OpenSSLCryptoProvider.cpp
  
  Index: OpenSSLCryptoProvider.cpp
  ===================================================================
  RCS file: /home/cvs/xml-security/c/src/enc/OpenSSL/OpenSSLCryptoProvider.cpp,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- OpenSSLCryptoProvider.cpp	9 Feb 2003 11:13:50 -0000	1.2
  +++ OpenSSLCryptoProvider.cpp	22 Feb 2003 08:47:24 -0000	1.3
  @@ -64,9 +64,7 @@
    *
    * Author(s): Berin Lautenbach
    *
  - * $ID$
  - *
  - * $LOG$
  + * $Id$
    *
    */
   
  @@ -152,4 +150,4 @@
   
   	return ret;
   
  -}
  \ No newline at end of file
  +}
  
  
  
  1.3       +2 -5      xml-security/c/src/enc/OpenSSL/OpenSSLCryptoX509.cpp
  
  Index: OpenSSLCryptoX509.cpp
  ===================================================================
  RCS file: /home/cvs/xml-security/c/src/enc/OpenSSL/OpenSSLCryptoX509.cpp,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- OpenSSLCryptoX509.cpp	9 Feb 2003 11:13:50 -0000	1.2
  +++ OpenSSLCryptoX509.cpp	22 Feb 2003 08:47:24 -0000	1.3
  @@ -64,9 +64,7 @@
    *
    * Author(s): Berin Lautenbach
    *
  - * $ID$
  - *
  - * $LOG$
  + * $Id$
    *
    */
   
  @@ -107,9 +105,8 @@
   
   	// Translate X509 to Base64
   
  -	int sz = i2d_X509_bio(b64, x);
  +	i2d_X509_bio(b64, x);
   
  -	//BIO_write(b64, encryptBuf, encryptLen);
   	BIO_flush(b64);
   
   	char buf[1024];
  
  
  
  1.3       +2 -1      xml-security/c/src/framework/XSECConfig.hpp.in
  
  Index: XSECConfig.hpp.in
  ===================================================================
  RCS file: /home/cvs/xml-security/c/src/framework/XSECConfig.hpp.in,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- XSECConfig.hpp.in	20 Feb 2003 10:35:57 -0000	1.2
  +++ XSECConfig.hpp.in	22 Feb 2003 08:47:24 -0000	1.3
  @@ -84,4 +84,5 @@
   #undef HAVE_UNISTD_H
   
   /* Windows direct.h */
  -#undef HAVE_DIRECT_H
  \ No newline at end of file
  +#undef HAVE_DIRECT_H
  +
  
  
  
  1.3       +1 -1      xml-security/c/src/framework/XSECURIResolver.hpp
  
  Index: XSECURIResolver.hpp
  ===================================================================
  RCS file: /home/cvs/xml-security/c/src/framework/XSECURIResolver.hpp,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- XSECURIResolver.hpp	9 Feb 2003 11:13:50 -0000	1.2
  +++ XSECURIResolver.hpp	22 Feb 2003 08:47:24 -0000	1.3
  @@ -150,4 +150,4 @@
   };
   
   
  -#endif /* XSECURIRESOLVER_INCLUDE */
  \ No newline at end of file
  +#endif /* XSECURIRESOLVER_INCLUDE */
  
  
  
  1.3       +2 -4      xml-security/c/src/framework/XSECURIResolverXerces.hpp
  
  Index: XSECURIResolverXerces.hpp
  ===================================================================
  RCS file: /home/cvs/xml-security/c/src/framework/XSECURIResolverXerces.hpp,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- XSECURIResolverXerces.hpp	9 Feb 2003 11:13:50 -0000	1.2
  +++ XSECURIResolverXerces.hpp	22 Feb 2003 08:47:24 -0000	1.3
  @@ -65,9 +65,7 @@
    *
    * Author(s): Berin Lautenbach
    *
  - * $ID$
  - *
  - * $LOG$
  + * $Id$
    *
    */
   
  @@ -158,4 +156,4 @@
   
   };
   
  -#endif /* XSECURIRESOLVERXERCES_INCLUDE */
  \ No newline at end of file
  +#endif /* XSECURIRESOLVERXERCES_INCLUDE */
  
  
  
  1.3       +8 -4      xml-security/c/src/samples/IOStreamOutputter.hpp
  
  Index: IOStreamOutputter.hpp
  ===================================================================
  RCS file: /home/cvs/xml-security/c/src/samples/IOStreamOutputter.hpp,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- IOStreamOutputter.hpp	9 Feb 2003 11:13:51 -0000	1.2
  +++ IOStreamOutputter.hpp	22 Feb 2003 08:47:24 -0000	1.3
  @@ -67,15 +67,19 @@
    *
    * Author(s): Berin Lautenbach
    *
  - * $ID$
  - *
  - * $LOG$
  + * $Id$
    *
    */
   
   #include <xercesc/dom/DOM.hpp>
   #include <xercesc/framework/XMLFormatter.hpp>
  -#include <iostream.h>
  +#include <iostream>
  +
  +using std::cerr;
  +using std::cout;
  +using std::endl;
  +using std::ostream;
  +using std::flush;
   
   // --------------------------------------------------------------------------------
   //           Much code taken from the DOMPrint Xerces example
  
  
  
  1.3       +6 -4      xml-security/c/src/tools/c14n/c14n.cpp
  
  Index: c14n.cpp
  ===================================================================
  RCS file: /home/cvs/xml-security/c/src/tools/c14n/c14n.cpp,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- c14n.cpp	9 Feb 2003 11:13:51 -0000	1.2
  +++ c14n.cpp	22 Feb 2003 08:47:24 -0000	1.3
  @@ -65,9 +65,7 @@
    *
    * Author(s): Berin Lautenbach
    *
  - * $ID$
  - *
  - * $LOG$
  + * $Id$
    *
    */
   
  @@ -80,7 +78,7 @@
   
   #include <memory.h>
   #include <string.h>
  -#include <iostream.h>
  +#include <iostream>
   #include <stdlib.h>
   
   #include <xercesc/util/PlatformUtils.hpp>
  @@ -100,6 +98,10 @@
   XSEC_USING_XERCES(XercesDOMParser);
   XSEC_USING_XERCES(XMLPlatformUtils);
   XSEC_USING_XERCES(DOMException);
  +
  +using std::endl;
  +using std::cout;
  +using std::cerr;
   
   void printUsage(void) {
   
  
  
  
  1.8       +7 -16     xml-security/c/src/tools/checksig/checksig.cpp
  
  Index: checksig.cpp
  ===================================================================
  RCS file: /home/cvs/xml-security/c/src/tools/checksig/checksig.cpp,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- checksig.cpp	20 Feb 2003 10:34:24 -0000	1.7
  +++ checksig.cpp	22 Feb 2003 08:47:24 -0000	1.8
  @@ -66,20 +66,6 @@
    *
    * $Id$
    *
  - * $Log$
  - * Revision 1.7  2003/02/20 10:34:24  blautenb
  - * Check for unistd.h
  - *
  - * Revision 1.6  2003/02/18 11:28:12  blautenb
  - * Catch and clean up after Xalan exceptions
  - *
  - * Revision 1.5  2003/02/17 11:22:39  blautenb
  - * Now handle relative file URIs in references
  - *
  - * Revision 1.4  2003/02/12 11:21:03  blautenb
  - * UNIX generic URI resolver
  - *
  - *
    */
   
   // XSEC
  @@ -106,7 +92,7 @@
   
   #include <memory.h>
   #include <string.h>
  -#include <iostream.h>
  +#include <iostream>
   #include <stdlib.h>
   
   #if defined(HAVE_UNISTD_H)
  @@ -139,6 +125,10 @@
   XSEC_USING_XERCES(XMLUri);
   XSEC_USING_XERCES(Janitor);
   
  +using std::cerr;
  +using std::cout;
  +using std::endl;
  +
   #ifndef XSEC_NO_XALAN
   
   // XALAN
  @@ -329,9 +319,7 @@
   
   		// Find any ':' and "\" characters
   		int lastSlash;
  -		for (int i = 8; i < strlen(baseURI); ++i) {
  -//			if (path[i] == ':')
  -//				path[i] = '|';
  +		for (unsigned int i = 8; i < strlen(baseURI); ++i) {
   			if (baseURI[i] == '\\') {
   				lastSlash = i;
   				baseURI[i] = '/';
  
  
  
  1.4       +8 -2      xml-security/c/src/tools/templatesign/templatesign.cpp
  
  Index: templatesign.cpp
  ===================================================================
  RCS file: /home/cvs/xml-security/c/src/tools/templatesign/templatesign.cpp,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- templatesign.cpp	21 Feb 2003 11:53:08 -0000	1.3
  +++ templatesign.cpp	22 Feb 2003 08:47:24 -0000	1.4
  @@ -85,7 +85,7 @@
   
   #include <memory.h>
   #include <string.h>
  -#include <iostream.h>
  +#include <iostream>
   #include <stdlib.h>
   
   #include <xercesc/util/PlatformUtils.hpp>
  @@ -104,6 +104,12 @@
   
   XALAN_USING_XALAN(XPathEvaluator)
   XALAN_USING_XALAN(XalanTransformer)
  +
  +using std::ostream;
  +using std::cout;
  +using std::cerr;
  +using std::endl;
  +using std::flush;
   
   #endif
   
  
  
  
  1.6       +12 -7     xml-security/c/src/tools/txfmout/txfmout.cpp
  
  Index: txfmout.cpp
  ===================================================================
  RCS file: /home/cvs/xml-security/c/src/tools/txfmout/txfmout.cpp,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- txfmout.cpp	21 Feb 2003 11:53:08 -0000	1.5
  +++ txfmout.cpp	22 Feb 2003 08:47:24 -0000	1.6
  @@ -92,7 +92,8 @@
   
   #include <memory.h>
   #include <string.h>
  -#include <iostream.h>
  +#include <iostream>
  +#include <fstream>
   #include <stdlib.h>
   
   #if defined(HAVE_UNISTD_H)
  @@ -121,6 +122,12 @@
   XSEC_USING_XERCES(XMLPlatformUtils);
   XSEC_USING_XERCES(XMLUri);
   
  +using std::ios;
  +using std::cout;
  +using std::cerr;
  +using std::endl;
  +using std::ofstream;
  +
   #ifndef XSEC_NO_XALAN
   
   // XALAN
  @@ -133,8 +140,6 @@
   
   #endif
   
  -#include <fstream.h>
  -
   #ifdef XSEC_NO_XALAN
   
   ostream& operator<< (ostream& target, const XMLCh * s)
  @@ -292,12 +297,12 @@
   
   	if (m_cout || m_out.is_open() == false) {
   
  -		cout.write(buf,sz);
  +		cout.write((const char *) buf,sz);
   
   	}
   	else {
   
  -		m_out.write(buf, sz);
  +		m_out.write((const char *) buf, sz);
   
   	}
   
  @@ -555,7 +560,7 @@
   
   	// Find any ':' and "\" characters
   	int lastSlash;
  -	for (int i = 8; i < strlen(baseURI); ++i) {
  +	for (unsigned int i = 8; i < strlen(baseURI); ++i) {
   		if (baseURI[i] == '\\') {
   			lastSlash = i;
   			baseURI[i] = '/';
  
  
  
  1.3       +11 -5     xml-security/c/src/tools/xtest/xtest.cpp
  
  Index: xtest.cpp
  ===================================================================
  RCS file: /home/cvs/xml-security/c/src/tools/xtest/xtest.cpp,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- xtest.cpp	9 Feb 2003 11:13:51 -0000	1.2
  +++ xtest.cpp	22 Feb 2003 08:47:24 -0000	1.3
  @@ -75,7 +75,7 @@
   #include <cassert>
   
   #include <memory.h>
  -#include <iostream.h>
  +#include <iostream>
   #include <stdlib.h>
   
   #include <xercesc/util/PlatformUtils.hpp>
  @@ -134,6 +134,12 @@
    * in the Xerces namespace
    */
   
  +using std::ostream;
  +using std::cout;
  +using std::cerr;
  +using std::endl;
  +using std::flush;
  +
   XERCES_CPP_NAMESPACE_USE
   
   // --------------------------------------------------------------------------------
  @@ -644,11 +650,11 @@
   //
   //	}
   
  -	cout << hex;
  +	cout << std::ios::hex;
   	for (int i = 0; i < len; ++i) {
   		cout << "0x" << (unsigned int) buf[i] << ", ";
   	}
  -	cout << dec << endl;
  +	cout << std::ios::dec << endl;
   
   }
   
  @@ -809,9 +815,9 @@
   		}
   		else {
   			cerr << "Failed" << endl;
  -			const char * e = XMLString::transcode(sig->getErrMsgs());
  +			char * e = XMLString::transcode(sig->getErrMsgs());
   			cout << e << endl;
  -			delete [] (void *) e;
  +			delete [] e;
   			exit(1);
   		}
   
  
  
  
  1.5       +3 -2      xml-security/c/src/transformers/TXFMBase.cpp
  
  Index: TXFMBase.cpp
  ===================================================================
  RCS file: /home/cvs/xml-security/c/src/transformers/TXFMBase.cpp,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- TXFMBase.cpp	21 Feb 2003 11:53:08 -0000	1.4
  +++ TXFMBase.cpp	22 Feb 2003 08:47:24 -0000	1.5
  @@ -145,4 +145,5 @@
   		
   		keepComments = true;
   
  -}
  \ No newline at end of file
  +}
  +
  
  
  
  1.4       +2 -2      xml-security/c/src/transformers/TXFMBase.hpp
  
  Index: TXFMBase.hpp
  ===================================================================
  RCS file: /home/cvs/xml-security/c/src/transformers/TXFMBase.hpp,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- TXFMBase.hpp	21 Feb 2003 11:53:08 -0000	1.3
  +++ TXFMBase.hpp	22 Feb 2003 08:47:24 -0000	1.4
  @@ -156,7 +156,7 @@
   
   	// Friends and Statics
   
  -	friend TXFMChain;
  +	friend class TXFMChain;
   
   
   private:
  
  
  
  1.3       +3 -4      xml-security/c/src/transformers/TXFMBase64.hpp
  
  Index: TXFMBase64.hpp
  ===================================================================
  RCS file: /home/cvs/xml-security/c/src/transformers/TXFMBase64.hpp,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- TXFMBase64.hpp	9 Feb 2003 11:13:51 -0000	1.2
  +++ TXFMBase64.hpp	22 Feb 2003 08:47:24 -0000	1.3
  @@ -64,9 +64,7 @@
    *
    * Author(s): Berin Lautenbach
    *
  - * $ID$
  - *
  - * $LOG$
  + * $Id$
    *
    */
   
  @@ -111,4 +109,5 @@
   	
   private:
   	TXFMBase64();
  -};
  \ No newline at end of file
  +};
  +
  
  
  
  1.3       +2 -4      xml-security/c/src/transformers/TXFMC14n.hpp
  
  Index: TXFMC14n.hpp
  ===================================================================
  RCS file: /home/cvs/xml-security/c/src/transformers/TXFMC14n.hpp,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- TXFMC14n.hpp	9 Feb 2003 11:13:51 -0000	1.2
  +++ TXFMC14n.hpp	22 Feb 2003 08:47:24 -0000	1.3
  @@ -64,9 +64,7 @@
    *
    * Author(s): Berin Lautenbach
    *
  - * $ID$
  - *
  - * $LOG$
  + * $Id$
    *
    */
   
  @@ -112,4 +110,4 @@
   	
   private:
   	TXFMC14n();
  -};
  \ No newline at end of file
  +};
  
  
  
  1.4       +5 -3      xml-security/c/src/transformers/TXFMOutputFile.cpp
  
  Index: TXFMOutputFile.cpp
  ===================================================================
  RCS file: /home/cvs/xml-security/c/src/transformers/TXFMOutputFile.cpp,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- TXFMOutputFile.cpp	21 Feb 2003 11:53:08 -0000	1.3
  +++ TXFMOutputFile.cpp	22 Feb 2003 08:47:24 -0000	1.4
  @@ -100,6 +100,8 @@
   
   	// Open a file for outputting
   
  +	using std::ios;
  +
   	f.open(fileName, ios::binary);
   
   	if (f.is_open())
  @@ -142,7 +144,7 @@
   	sz = input->readBytes(toFill, maxToFill);
   
   	if (f.is_open())
  -		f.write(toFill, sz);
  +		f.write((char *) toFill, sz);
   
   	return sz;
   
  @@ -164,4 +166,4 @@
   
   	return NULL;	// Empty string
   
  -}
  \ No newline at end of file
  +}
  
  
  
  1.3       +5 -5      xml-security/c/src/transformers/TXFMOutputFile.hpp
  
  Index: TXFMOutputFile.hpp
  ===================================================================
  RCS file: /home/cvs/xml-security/c/src/transformers/TXFMOutputFile.hpp,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- TXFMOutputFile.hpp	9 Feb 2003 11:13:51 -0000	1.2
  +++ TXFMOutputFile.hpp	22 Feb 2003 08:47:24 -0000	1.3
  @@ -65,9 +65,7 @@
    *
    * Author(s): Berin Lautenbach
    *
  - * $ID$
  - *
  - * $LOG$
  + * $Id$
    *
    */
   
  @@ -76,7 +74,9 @@
   
   #include <xsec/transformers/TXFMBase.hpp>
   
  -#include <fstream.h>
  +#include <fstream>
  +
  +using std::ofstream;
   
   class DSIG_EXPORT TXFMOutputFile : public TXFMBase {
   
  @@ -116,4 +116,4 @@
   
   
   
  -#endif /* #define TXFMOUTPUTFILE_INCLUDE */
  \ No newline at end of file
  +#endif /* #define TXFMOUTPUTFILE_INCLUDE */
  
  
  
  1.3       +1 -1      xml-security/c/src/transformers/TXFMSB.cpp
  
  Index: TXFMSB.cpp
  ===================================================================
  RCS file: /home/cvs/xml-security/c/src/transformers/TXFMSB.cpp,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- TXFMSB.cpp	9 Feb 2003 11:13:51 -0000	1.2
  +++ TXFMSB.cpp	22 Feb 2003 08:47:24 -0000	1.3
  @@ -191,4 +191,4 @@
   
   	return NULL;	// Empty string
   
  -}
  \ No newline at end of file
  +}
  
  
  
  1.3       +2 -1      xml-security/c/src/transformers/TXFMSB.hpp
  
  Index: TXFMSB.hpp
  ===================================================================
  RCS file: /home/cvs/xml-security/c/src/transformers/TXFMSB.hpp,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- TXFMSB.hpp	9 Feb 2003 11:13:51 -0000	1.2
  +++ TXFMSB.hpp	22 Feb 2003 08:47:24 -0000	1.3
  @@ -107,4 +107,5 @@
   	
   private:
   	TXFMSB();
  -};
  \ No newline at end of file
  +};
  +
  
  
  
  1.3       +2 -1      xml-security/c/src/transformers/TXFMSHA1.hpp
  
  Index: TXFMSHA1.hpp
  ===================================================================
  RCS file: /home/cvs/xml-security/c/src/transformers/TXFMSHA1.hpp,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- TXFMSHA1.hpp	9 Feb 2003 11:13:51 -0000	1.2
  +++ TXFMSHA1.hpp	22 Feb 2003 08:47:24 -0000	1.3
  @@ -109,4 +109,5 @@
   	
   private:
   	TXFMSHA1();
  -};
  \ No newline at end of file
  +};
  +
  
  
  
  1.3       +1 -1      xml-security/c/src/transformers/TXFMURL.cpp
  
  Index: TXFMURL.cpp
  ===================================================================
  RCS file: /home/cvs/xml-security/c/src/transformers/TXFMURL.cpp,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- TXFMURL.cpp	9 Feb 2003 11:13:51 -0000	1.2
  +++ TXFMURL.cpp	22 Feb 2003 08:47:24 -0000	1.3
  @@ -193,4 +193,4 @@
   
   	return NULL;	// Empty string
   
  -}
  \ No newline at end of file
  +}
  
  
  
  1.3       +2 -4      xml-security/c/src/transformers/TXFMURL.hpp
  
  Index: TXFMURL.hpp
  ===================================================================
  RCS file: /home/cvs/xml-security/c/src/transformers/TXFMURL.hpp,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- TXFMURL.hpp	9 Feb 2003 11:13:51 -0000	1.2
  +++ TXFMURL.hpp	22 Feb 2003 08:47:24 -0000	1.3
  @@ -64,9 +64,7 @@
    *
    * Author(s): Berin Lautenbach
    *
  - * $ID$
  - *
  - * $LOG$
  + * $Id$
    *
    */
   
  @@ -112,4 +110,4 @@
   	
   private :
   	TXFMURL();
  -};
  \ No newline at end of file
  +};
  
  
  
  1.6       +6 -9      xml-security/c/src/transformers/TXFMXPath.cpp
  
  Index: TXFMXPath.cpp
  ===================================================================
  RCS file: /home/cvs/xml-security/c/src/transformers/TXFMXPath.cpp,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- TXFMXPath.cpp	21 Feb 2003 11:53:08 -0000	1.5
  +++ TXFMXPath.cpp	22 Feb 2003 08:47:24 -0000	1.6
  @@ -103,8 +103,9 @@
   
   #endif
   
  -#ifndef XSEC_NO_XPATH
  -#include <ostream.h>
  +#if !defined(XSEC_NO_XPATH)
  +
  +#include <iostream>
   
   #define KLUDGE_PREFIX "berindsig"
   
  @@ -338,8 +339,7 @@
   
   		// Map the "here" node - but only if part of current document
   
  -		bool haveHereNode;
  -		XalanNode * hereNode;
  +		XalanNode * hereNode = NULL;
   
   		if (h->getOwnerDocument() == document) {
   			
  @@ -356,10 +356,7 @@
   				}
   
   			}
  -			haveHereNode = true;
   		}
  -		else
  -			haveHereNode = false;
   
   		// Now work out what we have to set up in the new processing
   
  @@ -471,7 +468,7 @@
   
   		// Install the External function in the Environment handler
   
  -		if (haveHereNode) {
  +		if (hereNode != NULL) {
   
   			xpesd.installExternalFunctionLocal(XalanDOMString(URI_ID_DSIG), XalanDOMString("here"), DSIGXPathHere(hereNode));
   
  
  
  
  1.4       +3 -1      xml-security/c/src/transformers/TXFMXSL.cpp
  
  Index: TXFMXSL.cpp
  ===================================================================
  RCS file: /home/cvs/xml-security/c/src/transformers/TXFMXSL.cpp,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- TXFMXSL.cpp	21 Feb 2003 11:53:08 -0000	1.3
  +++ TXFMXSL.cpp	22 Feb 2003 08:47:25 -0000	1.4
  @@ -199,6 +199,8 @@
   	// Set up iostreams for input
   	std::istrstream	theXMLStream((char *) sbInDoc.rawBuffer(), strlen((char *) sbInDoc.rawBuffer()));
   	std::istrstream	theXSLStream((char *) sbStyleSheet.rawBuffer(), strlen((char *) sbStyleSheet.rawBuffer()));
  +	//std::istringstream	theXMLStream((char *) sbInDoc.rawBuffer(), strlen((char *) sbInDoc.rawBuffer()));
  +	//std::istringstream	theXSLStream((char *) sbStyleSheet.rawBuffer(), strlen((char *) sbStyleSheet.rawBuffer()));
   
   	// Now resolve
   
  
  
  
  1.3       +2 -4      xml-security/c/src/transformers/TXFMXSL.hpp
  
  Index: TXFMXSL.hpp
  ===================================================================
  RCS file: /home/cvs/xml-security/c/src/transformers/TXFMXSL.hpp,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- TXFMXSL.hpp	9 Feb 2003 11:13:52 -0000	1.2
  +++ TXFMXSL.hpp	22 Feb 2003 08:47:25 -0000	1.3
  @@ -64,9 +64,7 @@
    *
    * Author(s): Berin Lautenbach
    *
  - * $ID$
  - *
  - * $LOG$
  + * $Id$
    *
    */
   
  @@ -155,4 +153,4 @@
   
   };
   
  -#endif /* No XSLT */
  \ No newline at end of file
  +#endif /* No XSLT */
  
  
  
  1.3       +3 -4      xml-security/c/src/utils/XSECDOMUtils.hpp
  
  Index: XSECDOMUtils.hpp
  ===================================================================
  RCS file: /home/cvs/xml-security/c/src/utils/XSECDOMUtils.hpp,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- XSECDOMUtils.hpp	9 Feb 2003 11:13:52 -0000	1.2
  +++ XSECDOMUtils.hpp	22 Feb 2003 08:47:26 -0000	1.3
  @@ -64,9 +64,7 @@
    *
    * Author(s): Berin Lautenbach
    *
  - * $ID$
  - *
  - * $LOG$
  + * $Id$
    *
    */
   
  @@ -193,4 +191,5 @@
   
   }
   
  -#endif /* XSECDOMUTILS_HEADER */
  \ No newline at end of file
  +#endif /* XSECDOMUTILS_HEADER */
  +
  
  
  
  1.3       +3 -4      xml-security/c/src/utils/XSECNameSpaceExpander.hpp
  
  Index: XSECNameSpaceExpander.hpp
  ===================================================================
  RCS file: /home/cvs/xml-security/c/src/utils/XSECNameSpaceExpander.hpp,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- XSECNameSpaceExpander.hpp	9 Feb 2003 11:13:52 -0000	1.2
  +++ XSECNameSpaceExpander.hpp	22 Feb 2003 08:47:26 -0000	1.3
  @@ -65,9 +65,7 @@
    *
    * Author(s): Berin Lautenbach
    *
  - * $ID$
  - *
  - * $LOG$
  + * $Id$
    *
    */
   
  @@ -139,4 +137,5 @@
   
   };
   
  -#endif /* XSECNAMESPACEEXPANDER_HEADER */
  \ No newline at end of file
  +#endif /* XSECNAMESPACEEXPANDER_HEADER */
  +
  
  
  
  1.4       +2 -4      xml-security/c/src/utils/XSECPlatformUtils.cpp
  
  Index: XSECPlatformUtils.cpp
  ===================================================================
  RCS file: /home/cvs/xml-security/c/src/utils/XSECPlatformUtils.cpp,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- XSECPlatformUtils.cpp	12 Feb 2003 09:43:04 -0000	1.3
  +++ XSECPlatformUtils.cpp	22 Feb 2003 08:47:26 -0000	1.4
  @@ -64,10 +64,8 @@
    *
    * Author(s): Berin Lautenbach
    *
  - * $ID$
  + * $Id$
    *
  - * $LOG$
  - *					 
    */
   
   // XSEC
  @@ -118,4 +116,4 @@
   	XSECBinHTTPURIInputStream::Cleanup();
   #endif
   
  -}
  \ No newline at end of file
  +}
  
  
  
  1.3       +3 -4      xml-security/c/src/utils/XSECPlatformUtils.hpp
  
  Index: XSECPlatformUtils.hpp
  ===================================================================
  RCS file: /home/cvs/xml-security/c/src/utils/XSECPlatformUtils.hpp,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- XSECPlatformUtils.hpp	9 Feb 2003 11:13:52 -0000	1.2
  +++ XSECPlatformUtils.hpp	22 Feb 2003 08:47:26 -0000	1.3
  @@ -64,9 +64,7 @@
    *
    * Author(s): Berin Lautenbach
    *
  - * $ID$
  - *
  - * $LOG$
  + * $Id$
    *					 
    */
   
  @@ -95,4 +93,5 @@
   
   };
   
  -#endif /* XSECPLATFORMUTILS_INCLUDE */
  \ No newline at end of file
  +#endif /* XSECPLATFORMUTILS_INCLUDE */
  +
  
  
  
  1.3       +3 -4      xml-security/c/src/utils/XSECSafeBuffer.hpp
  
  Index: XSECSafeBuffer.hpp
  ===================================================================
  RCS file: /home/cvs/xml-security/c/src/utils/XSECSafeBuffer.hpp,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- XSECSafeBuffer.hpp	9 Feb 2003 11:13:52 -0000	1.2
  +++ XSECSafeBuffer.hpp	22 Feb 2003 08:47:26 -0000	1.3
  @@ -64,9 +64,7 @@
    *
    * Author(s): Berin Lautenbach
    *
  - * $ID$
  - *
  - * $LOG$
  + * $Id$
    *					 
    */
   
  @@ -173,4 +171,5 @@
   	static size_t	size_XMLCh;
   };
   
  -#endif /* XSECSAFEBUFFER_INCLUDE */
  \ No newline at end of file
  +#endif /* XSECSAFEBUFFER_INCLUDE */
  +
  
  
  
  1.3       +2 -4      xml-security/c/src/utils/XSECSafeBufferFormatter.cpp
  
  Index: XSECSafeBufferFormatter.cpp
  ===================================================================
  RCS file: /home/cvs/xml-security/c/src/utils/XSECSafeBufferFormatter.cpp,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- XSECSafeBufferFormatter.cpp	9 Feb 2003 11:13:52 -0000	1.2
  +++ XSECSafeBufferFormatter.cpp	22 Feb 2003 08:47:26 -0000	1.3
  @@ -64,9 +64,7 @@
    *
    * Author(s): Berin Lautenbach
    *
  - * $ID$
  - *
  - * $LOG$
  + * $Id$
    *
    */
   
  @@ -255,4 +253,4 @@
       return *this;
   }
   
  -*/
  \ No newline at end of file
  +*/
  
  
  
  1.3       +3 -4      xml-security/c/src/utils/XSECXPathNodeList.hpp
  
  Index: XSECXPathNodeList.hpp
  ===================================================================
  RCS file: /home/cvs/xml-security/c/src/utils/XSECXPathNodeList.hpp,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- XSECXPathNodeList.hpp	9 Feb 2003 11:13:53 -0000	1.2
  +++ XSECXPathNodeList.hpp	22 Feb 2003 08:47:26 -0000	1.3
  @@ -65,9 +65,7 @@
    *
    * Author(s): Berin Lautenbach
    *
  - * $ID$
  - *
  - * $LOG$
  + * $Id$
    *
    */
   
  @@ -234,4 +232,5 @@
   
   
   
  -#endif /* XSECXPATHNODELIST_INCLUDE */
  \ No newline at end of file
  +#endif /* XSECXPATHNODELIST_INCLUDE */
  +
  
  
  

Mime
View raw message