From e6ad041870eb71089ffa29ff8b8c78b84a26b9b3 Mon Sep 17 00:00:00 2001 From: Eduardo DAVILA Date: Thu, 22 Dec 2016 12:04:11 +0100 Subject: [PATCH] #3047 creaMaracasVisu Bug New Normal - Fedora 24 gcc 6 conflict with std::ofstream NULL / is_open()=false --- lib/maracasVisuLib/src/kernel/marParameters.cpp | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/lib/maracasVisuLib/src/kernel/marParameters.cpp b/lib/maracasVisuLib/src/kernel/marParameters.cpp index 1b582f7..b201515 100644 --- a/lib/maracasVisuLib/src/kernel/marParameters.cpp +++ b/lib/maracasVisuLib/src/kernel/marParameters.cpp @@ -328,8 +328,10 @@ bool marParameters::save( wxString& nw ) //EEDxx2.4 DEBuG // wxLogDebug("Saving parameters to file " + nw); - - if( os==NULL ) + +//EED2016-12-22 +// if( os==NULL ) + if( os.is_open()==false ) { wxString errorMsg; errorMsg= _T("Error : Cannot open file ")+nw+_T(" to save parameters"); @@ -360,7 +362,10 @@ bool marParameters::load( wxString& nr ) //EEDxx2.4 DEBuG // wxLogDebug("Laoding parameters from file " + nr); - if( is==NULL ) + +//EED 2016-12-22 +// if( is==NULL ) + if( is.is_open()==false ) { wxString errorMsg; errorMsg= _T("Error : Cannot open file ")+nr+_T(" to load parameters"); -- 2.47.1