Changeset 1008

Show
Ignore:
Timestamp:
11/14/08 11:28:12 (2 months ago)
Author:
dutka
Message:

Fix minor bugs to support GCC 4.4 (from Debian Bug#505650: FTBFS with GCC 4.4: missing #include).
Enhanced WrapperFile class.
Enhanced WrapperData class.
Make distcheck ok.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/lib/src/Base/Func/WrapperData.cxx

    r990 r1008  
    126126      { 
    127127        OSS oss; 
    128         oss << "state="  << WrapperConfigurationStateAsString[state_] 
    129             << " mode="  << WrapperConfigurationModeAsString[mode_] 
    130             << " in="    << WrapperDataTransferModeAsString[in_] 
    131             << " out="   << WrapperDataTransferModeAsString[out_]; 
     128        oss << "state="    << WrapperConfigurationStateAsString[state_] 
     129            << " mode="    << WrapperConfigurationModeAsString[mode_] 
     130            << " in="      << WrapperDataTransferModeAsString[in_] 
     131            << " out="     << WrapperDataTransferModeAsString[out_] 
     132            << " command=" << command_; 
    132133        return oss; 
    133134      } 

  • trunk/lib/src/Base/Func/WrapperFile.cxx

    r1003 r1008  
    7171      CLASSNAMEINIT(WrapperFile); 
    7272 
    73       /* 
    74        * Default constructor 
    75        */ 
     73      /* Default constructor */ 
     74      WrapperFile::WrapperFile() 
     75        : PersistentObject(), 
     76          descriptionFilePath_(), 
     77          data_() 
     78      { 
     79        // Nothing to do 
     80      } 
     81 
     82      /* Constructor from file */ 
    7683      WrapperFile::WrapperFile(const FileName & pathToFile) 
    7784        throw(WrapperFileParsingException) 
    …… 
    97104        OSS oss; 
    98105        oss << "class=" << getClassName() 
    99             << " name=" << getName() 
     106            << " path=" << getDescriptionFilePath() 
    100107            << " data={" << data_ 
    101108            << "}"; 
    …… 
    542549        // Write out the document to a file 
    543550        doc.save( pathToFile ); 
    544       } 
     551 
     552        setDescriptionFilePath( pathToFile ); 
     553  } 
    545554 
    546555#else 

  • trunk/lib/src/Base/Func/WrapperFile.hxx

    r1003 r1008  
    7878      public: 
    7979 
    80         /**  
    81          * Default constructor 
    82          */ 
     80        /** Default constructor */ 
     81        WrapperFile(); 
     82 
     83        /** Constructor from file */ 
    8384        explicit WrapperFile(const FileName & pathToFile) 
    8485          throw(WrapperFileParsingException); 

  • trunk/lib/src/Base/Graph/Contour.cxx

    r937 r1008  
    2424 *  Id:      $Id$ 
    2525 */ 
     26#include <cstdio> 
    2627#include "Contour.hxx" 
    2728#include "PersistentObjectFactory.hxx" 

  • trunk/lib/src/Base/Graph/DrawableImplementation.cxx

    r818 r1008  
    2626 
    2727#include <algorithm> 
     28#include <cstdio> 
    2829#include <cstdlib> 
    2930#include "DrawableImplementation.hxx" 

  • trunk/lib/src/Uncertainty/Distribution/ExtraFunc/dcdflib.cxx

    r929 r1008  
    2828# include <cmath> 
    2929# include <ctime> 
     30# include <cstdio> 
    3031# include <cstdlib> 
    3132 

  • trunk/lib/test/external_code_threads.cxx

    r862 r1008  
    2626#include <iostream> 
    2727#include <cmath> 
     28#include <cstdio> 
    2829#include <cstdlib> 
    2930#include "OT.hxx"