gnu-gift/10_gcc-4.3.diff

   1
   2 Patch to fix compilation with gcc-4.3, thanks to Cyril Brulebois.
   3
   4 --- a/GIFTServer/modifyDistanceMatrix.cc
   5 +++ b/GIFTServer/modifyDistanceMatrix.cc
   6 @@ -15,6 +15,7 @@
   7  #include <string>
   8  #include <map>
   9  #include <functional>
  10 +#include <cstdlib>
  11
  12  using namespace std;
  13
  14 --- a/libGIFTAcDistanceMatrix/include/CPersistentTranslatedIndexMatrix.h
  15 +++ b/libGIFTAcDistanceMatrix/include/CPersistentTranslatedIndexMatrix.h
  16 @@ -75,8 +75,8 @@
  17    bool getLineVector(const TTID& inI,
  18                      CIDContentPairList& outList)const;
  19    ///
  20 -  bool setValue(const TTID& inX,
  21 -               const TTID& inX,
  22 +  bool setValue(const TTID& inX1,
  23 +               const TTID& inX2,
  24                 const TTContent& inValue)const;
  25    ///
  26    operator bool()const;
  27 --- a/libGIFTQuInvertedFile/cc/CWeightingFunction.cc
  28 +++ b/libGIFTQuInvertedFile/cc/CWeightingFunction.cc
  29 @@ -17,7 +17,7 @@
  30  ***************************************************/
  31  #include <cmath>
  32  #include "libGIFTQuInvertedFile/include/CWeightingFunction.h"
  33 -#include "iostream.h"
  34 +#include <iostream>
  35  #include "FeatureExtraction/gift_features.h"
  36
  37  #include <algorithm>
  38 --- a/libMRML/cc/CAccessorImplementation.cc
  39 +++ b/libMRML/cc/CAccessorImplementation.cc
  40 @@ -54,6 +54,7 @@
  41  #include <iostream>
  42  #include <cassert>
  43  #include <cmath>
  44 +#include <cstdlib>
  45
  46  #define _NO_PRINT_OFFSET_CHECK
  47  #define _NO_CHECK_OFFSET_FILE
  48 --- a/libMRML/cc/CCommunicationHandler.cc
  49 +++ b/libMRML/cc/CCommunicationHandler.cc
  50 @@ -16,6 +16,7 @@
  51  #include <stdlib.h>
  52  #include "libMRML/include/mrml_const.h" //mrml string constants newStart/EndMRMLElement
  53  #include "../include/CTimeStampGenerator.h" // for time stamps
  54 +#include <cstring>
  55  string gGIFTHome;//dirty but necessary
  56  CMutex* gMutex(0);   //we need a global one
  57
  58 --- a/libMRML/cc/CDynamicQueryFactory.cc
  59 +++ b/libMRML/cc/CDynamicQueryFactory.cc
  60 @@ -31,6 +31,7 @@
  61  // for file name treatment
  62  #include "libMRML/include/getLibNameFromFileName.h"
  63  #include <set>
  64 +#include <cstdlib>
  65
  66  CQuery* CDynamicQueryFactory::makeQuery(const string & inBaseType,
  67                                            CAccessorAdminCollection & inAccessorAdminCollection,
  68 --- a/libMRML/cc/CI18nTranslator.cc
  69 +++ b/libMRML/cc/CI18nTranslator.cc
  70 @@ -25,6 +25,7 @@
  71  #include "libMRML/include/CXEVI18nTranslator.h"
  72  #include <iostream>
  73  #include <fstream>
  74 +#include <cstring>
  75  /**
  76     This class offers runtime translation of strings. In contrast
  77     to GNU gettext we can chose during runtime the language without
  78 --- a/libMRML/cc/CQueryTreeBuilder.cc
  79 +++ b/libMRML/cc/CQueryTreeBuilder.cc
  80 @@ -3,6 +3,7 @@
  81  #include "libMRML/include/CQueryTreeBuilder.h"
  82  #include "libMRML/include/CAlgorithm.h"
  83  #include "libMRML/include/mrml_const.h"
  84 +#include <cstring>
  85  //----------------------------------------
  86
  87  CQueryTreeBuilder::CQueryTreeBuilder(){};
  88 --- a/libMRML/cc/CXMLElementBuilder.cc
  89 +++ b/libMRML/cc/CXMLElementBuilder.cc
  90 @@ -1,6 +1,7 @@
  91  #include <memory>
  92  #include <iostream> // for printouts
  93  #include "libMRML/include/CXMLElementBuilder.h"
  94 +#include <cstring>
  95
  96  void newStartXMLElement(void *inUserData,
  97                          const char *inElementName,
  98