[cmake-commits] king committed cmSourceFile.cxx 1.35.8.1 1.35.8.2

cmake-commits at cmake.org cmake-commits at cmake.org
Wed Jun 13 15:20:37 EDT 2007


Update of /cvsroot/CMake/CMake/Source
In directory public:/mounts/ram/cvs-serv11518

Modified Files:
      Tag: CMake-SourceFile2-b
	cmSourceFile.cxx 
Log Message:
BUG: Never return a null pointer from GetFullPath.  Too many places construct a string with the result.


Index: cmSourceFile.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmSourceFile.cxx,v
retrieving revision 1.35.8.1
retrieving revision 1.35.8.2
diff -u -d -r1.35.8.1 -r1.35.8.2
--- cmSourceFile.cxx	11 Jun 2007 22:23:34 -0000	1.35.8.1
+++ cmSourceFile.cxx	13 Jun 2007 19:20:35 -0000	1.35.8.2
@@ -53,7 +53,7 @@
       {
       this->Language = lang;
       }
-    else if(this->GetFullPath())
+    else if(this->GetFullPath()[0])
       {
       cmLocalGenerator* lg =
         this->Location.GetMakefile()->GetLocalGenerator();
@@ -84,10 +84,6 @@
       {
       self->CheckExtension();
       }
-    else
-      {
-      return 0;
-      }
     }
   return this->FullPath.c_str();
 }



More information about the Cmake-commits mailing list