rtf2html/rtf2html-0.2.0-gcc44.diff

   1 diff -Naur rtf2html-0.2.0~/rtf_keyword.h rtf2html-0.2.0/rtf_keyword.h
   2 --- rtf2html-0.2.0~/rtf_keyword.h       2010-01-19 09:57:43.000000000 -0600
   3 +++ rtf2html-0.2.0/rtf_keyword.h        2010-01-19 09:58:06.000000000 -0600
   4 @@ -1,6 +1,7 @@
   5  #ifndef __RTF_KEYWORD_H__
#define __RTF_KEYWORD_H__
   6
   7  
#include "config.h"
   8 +#include <cstdlib>
   9  #include <string>
  10  #include <map>
  11  #include <ctype.h>
  12 @@ -88,7 +89,7 @@
  13        if (param_str.empty())
  14           param=-1;
  15        else
  16 -         param=std::atoi(param_str.c_str());
  17 +         param=atoi(param_str.c_str());
  18        if (curchar==' ')
  19           ++iter;
  20        keyword_map::iterator kw_pos=keymap.find(s_keyword);
  21 diff -Naur rtf2html-0.2.0~/rtf_table.cpp rtf2html-0.2.0/rtf_table.cpp
  22 --- rtf2html-0.2.0~/rtf_table.cpp       2010-01-19 09:57:43.000000000 -0600
  23 +++ rtf2html-0.2.0/rtf_table.cpp        2010-01-19 09:58:26.000000000 -0600
  24 @@ -1,4 +1,5 @@
  25  #include "rtf_table.h"
  26 +#include <algorithm>
  27  #include <set>
  28  #include <ostream>
  29  #include <iostream>
  30 @@ -85,7 +86,7 @@
  31                   ++span_row)
  32              {
  33                 cell_def_2=
  34 -                   std::find_if((*span_row)->CellDefs->begin(),
  35 +                   find_if((*span_row)->CellDefs->begin(),
  36                                  (*span_row)->CellDefs->end(),
  37                                  std::bind2nd(
  38                                     std::mem_fun(&table_cell_def::right_equals),
  39 @@ -136,7 +137,7 @@
  40              for (row2=row; row2!=span_row; ++row2)
  41              {
  42                 cell_def_2=
  43 -                   std::find_if((*row2)->CellDefs->begin(),
  44 +                   find_if((*row2)->CellDefs->begin(),
  45                                  (*row2)->CellDefs->end(),
  46                                  std::bind2nd(
  47                                     std::mem_fun(&table_cell_def::right_equals),
  48 @@ -146,7 +147,7 @@
  49                    bleft=bleft && (*cell_def_2)->BorderRight;
  50                 }
  51                 cell_def_2=
  52 -                   std::find_if((*row2)->CellDefs->begin(),
  53 +                   find_if((*row2)->CellDefs->begin(),
  54                                  (*row2)->CellDefs->end(),
  55                                  std::bind2nd(
  56                                     std::mem_fun(&table_cell_def::left_equals),