From: ageay Date: Tue, 2 Oct 2012 10:50:50 +0000 (+0000) Subject: Fixing compilation error on gcc4.7 X-Git-Tag: V6_6_0a1~20 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=4c4352b638df8160cdfee9bd803a3c2af9d7fa42;p=modules%2Fkernel.git Fixing compilation error on gcc4.7 --- diff --git a/src/HDFPersist/HDFascii.cc b/src/HDFPersist/HDFascii.cc index cc08ea933..c8fd3acfd 100644 --- a/src/HDFPersist/HDFascii.cc +++ b/src/HDFPersist/HDFascii.cc @@ -408,7 +408,7 @@ char* HDFascii::ConvertFromASCIIToHDF(const char* thePath, fscanf(fp, "%s", id_of_end); if(strcmp(id_of_end, ASCIIHDF_ID_END) != 0) { std::cout << "ConvertFromASCIIToHDF : Can not find the end ASCII token " << std::endl; - return false; + return NULL; } hdf_file->CloseOnDisk(); diff --git a/src/SALOMEDSImpl/SALOMEDSImpl_UseCaseBuilder.cxx b/src/SALOMEDSImpl/SALOMEDSImpl_UseCaseBuilder.cxx index 1d86d349a..a7ab40d02 100644 --- a/src/SALOMEDSImpl/SALOMEDSImpl_UseCaseBuilder.cxx +++ b/src/SALOMEDSImpl/SALOMEDSImpl_UseCaseBuilder.cxx @@ -160,7 +160,7 @@ bool SALOMEDSImpl_UseCaseBuilder::AppendTo(const SALOMEDSImpl_SObject& theFather DF_Label aFatherLabel = theFather.GetLabel(), aLabel = theObject.GetLabel(); if(aFatherLabel == aLabel) return false; - SALOMEDSImpl_AttributeTreeNode *aFather = false, *aNode = false; + SALOMEDSImpl_AttributeTreeNode *aFather = NULL, *aNode = NULL; if(aFatherLabel.IsNull()) return false; if(!(aFather=(SALOMEDSImpl_AttributeTreeNode*)aFatherLabel.FindAttribute(_root->ID()))) return false;