]> SALOME platform Git repositories - modules/kernel.git/commitdiff
Salome HOME
Fixing compilation error on gcc4.7
authorageay <ageay>
Tue, 2 Oct 2012 10:50:50 +0000 (10:50 +0000)
committerageay <ageay>
Tue, 2 Oct 2012 10:50:50 +0000 (10:50 +0000)
src/HDFPersist/HDFascii.cc
src/SALOMEDSImpl/SALOMEDSImpl_UseCaseBuilder.cxx

index cc08ea93354717388449f0dea86daf6e4f916e97..c8fd3acfdb82ca52f7ab7246f8b8430656c7a4c0 100644 (file)
@@ -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();
index 1d86d349a19730213473e048e243a0240cef5cfc..a7ab40d02460a0c504b32a3c8279f1b0e57409de 100644 (file)
@@ -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;