Changeset 201

Timestamp:

03/31/14 23:22:29 (11 years ago)

Author:

Maciej Komosinski

Message:

Moved isAbsolutePath() to another source file and added implementation for Windows

Location:

cpp

Files:

• common/nonstd_stdio.cpp (modified) (2 diffs)
• common/nonstd_stdio.h (modified) (1 diff)
• frams/genetics/oper_fx.h (modified) (1 diff)

cpp/common/nonstd_stdio.cpp

@@ -4 +4 @@
 
 #include "nonstd_stdio.h"
+#include "nonstd.h"
+
 #if defined _WIN32 && !defined SHP
-//tu nie trzeba includów zeby dzialal unlink()
+ //<unistd.h> not needed for unlink()
+ #include "Shlwapi.h" //PathIsRelative()
+ #include "Util.h" //strTOwstr()
 #else
-#include <unistd.h>
-#endif
-#include "nonstd.h"
+ #include <unistd.h>
+#endif
 
 bool fileExists(const char* path)
@@ -25 +28 @@
 }
 
+bool isAbsolutePath(const char* fname)
+{
+        if (fname == NULL) return false; //SplitFileSystem never passes NULL but this function is public so we never know
+#if defined _WIN32 && !defined SHP
+        return PathIsRelative(Util::strTOwstr(fname).c_str()) == TRUE; //http://msdn.microsoft.com/en-us/library/bb773660%28v=vs.85%29.aspx
+#else
+        return fname[0] == PATH_SEPARATOR_CHAR;
+#endif
+}
 
 #if defined SHP && defined BADA_API_1

cpp/common/nonstd_stdio.h

@@ -8 +8 @@
 bool fileExists(const char* path);
 bool removeFile(const char* path);
+bool isAbsolutePath(const char* fname);
 
 #ifdef _WIN32

cpp/frams/genetics/oper_fx.h

@@ -83 +83 @@
    char supported_format; ///<genotype format which is supported by this class ('6' for GenoOper_f6, 'F' for GenoOper_fF, etc.). Must be initialized in constructor
    string name; ///<name of this set of genetic operators
-   const char **mutation_method_names; ///<array of names for mutation methods. If initialized (by new char*[]), must have entries for each method index returned by mutate(geno,chg,METHOD).  If initialized, it is automatically freed by this destructor.
+   const char **mutation_method_names; ///<array of names for mutation methods. If initialized (by new const char*[]), must have entries for each method index returned by mutate(geno,chg,METHOD).  If initialized, it is automatically freed by this destructor.
    GenoOperators() : par(empty_paramtab) {supported_format='x'; name="Default"; mutation_method_names=NULL; setDefaults();}