Sfoglia il codice sorgente

ENH: Try to remove warning

Andy Cedilnik 22 anni fa
parent
commit
f93b1e6d48
2 ha cambiato i file con 7 aggiunte e 7 eliminazioni
  1. 1 1
      Source/cmMakefile.cxx
  2. 6 6
      Source/cmMakefile.h

+ 1 - 1
Source/cmMakefile.cxx

@@ -2271,7 +2271,7 @@ void cmMakefile::ConfigureString(const std::string& input,
 }
 
 int cmMakefile::ConfigureFile(const char* infile, const char* outfile, 
-  int copyonly, int atOnly, int escapeQuotes)
+  bool copyonly, bool atOnly, bool escapeQuotes)
 {
   std::string soutfile = outfile;
   std::string sinfile = infile;

+ 6 - 6
Source/cmMakefile.h

@@ -551,6 +551,12 @@ public:
   void ConfigureString(const std::string& input, std::string& output,
                        bool atOnly, bool escapeQuotes);
 
+  /**
+   * Copy file but change lines acording to ConfigureString
+   */
+  int ConfigureFile(const char* infile, const char* outfile, 
+    bool copyonly, bool atOnly, bool escapeQuotes);
+
   /**
    * find what source group this source is in
    */
@@ -629,12 +635,6 @@ public:
    * Return a location of a file in cmake or custom modules directory
    */
   std::string GetModulesFile(const char* name);
-
-  /**
-   * Copy file but change lines acording to ConfigureString
-   */
-  int ConfigureFile(const char* infile, const char* outfile, 
-    int copyonly, int atOnly, int escapeQuotes);
   
 protected:
   // add link libraries and directories to the target