OpenCASCADE6.3.0-occ6.3.0.patch

   1 diff -uNr OpenCASCADE6.3.0-old/ros/configure.in OpenCASCADE6.3.0/ros/configure.in
   2 --- OpenCASCADE6.3.0-old/ros/configure.in       2008-10-02 23:27:17.000000000 +0200
   3 +++ OpenCASCADE6.3.0/ros/configure.in   2008-10-02 23:36:00.000000000 +0200
   4 @@ -127,8 +127,8 @@
   5  def_ios_ok,
   6  [AC_LANG([C++])
   7   AC_TRY_COMPILE([#include <stream.h>
   8 -static const int input = (ios::in) | (ios::nocreate);
   9 -static const int output= (ios::out);],
  10 +static const int input = (std::ios::in) | (std::ios::nocreate);
  11 +static const int output= (std::ios::out);],
  12  [return 0;],
  13   def_ios_ok=yes, def_ios_ok=no)
  14  ])
  15 @@ -141,7 +141,7 @@
  16  ostream_form_ok,
  17  [AC_LANG([C++])
  18   AC_TRY_COMPILE([#include <iostream.h>],
  19 -[cout << cout.form("%9.3e", 3.14159627e-4) << endl;
  20 +[std::cout << std::cout.form("%9.3e", 3.14159627e-4) << std::endl;
  21  return 0;],
  22   ostream_form_ok=yes, ostream_form_ok=no)
  23  ])
  24 diff -uNr OpenCASCADE6.3.0-old/ros/inc/Standard_Stream.hxx OpenCASCADE6.3.0/ros/inc/Standard_Stream.hxx
  25 --- OpenCASCADE6.3.0-old/ros/inc/Standard_Stream.hxx    2007-10-09 16:04:46.000000000 +0200
  26 +++ OpenCASCADE6.3.0/ros/inc/Standard_Stream.hxx        2008-10-02 23:36:00.000000000 +0200
  27 @@ -24,26 +24,12 @@
  28  // Unix variant
  29  #ifndef WNT
  30
  31 -#ifdef HAVE_IOSTREAM
  32    #include <iostream>
  33    #define USE_STL_STREAM
  34 -#elif defined (HAVE_IOSTREAM_H)
  35 -  #include <iostream.h>
  36 -#else
  37 -  #error "check config.h file or compilation options: either HAVE_IOSTREAM or HAVE_IOSTREAM_H should be defined"
  38 -#endif
  39
  40 -#ifdef HAVE_IOMANIP
  41    #include <iomanip>
  42 -#elif defined (HAVE_IOMANIP_H)
  43 -  #include <iomanip.h>
  44 -#endif
  45
  46 -#ifdef HAVE_FSTREAM
  47    #include <fstream>
  48 -#elif defined (HAVE_FSTREAM_H)
  49 -  #include <fstream.h>
  50 -#endif
  51
  52  // Windows variant
  53  #else /* WNT */
  54 diff -uNr OpenCASCADE6.3.0-old/ros/inc/Standard_values.h OpenCASCADE6.3.0/ros/inc/Standard_values.h
  55 --- OpenCASCADE6.3.0-old/ros/inc/Standard_values.h      2005-04-21 16:32:46.000000000 +0200
  56 +++ OpenCASCADE6.3.0/ros/inc/Standard_values.h  2008-10-02 23:36:00.000000000 +0200
  57 @@ -23,17 +23,7 @@
  58  #endif
  59
  60  #ifndef WNT
  61 -#ifdef HAVE_CONFIG_H
  62 -# include <config.h>
  63 -#endif
  64 -
  65 -#ifdef HAVE_LIMITS
  66 -# include <limits>
  67 -#elif defined (HAVE_LIMITS_H)
  68  # include <limits.h>
  69 -#else
  70 -#error "check config.h file or compilation options: either HAVE_LIMITS or HAVE_LIMITS_H should be defined"
  71 -#endif
  72  #endif
  73
  74