Changeset 319 for cpp/common/stl-util.cpp

Timestamp:

02/01/15 01:08:50 (9 years ago)

Author:

Maciej Komosinski

Message:

Fixed compilation warnings

File:

• cpp/common/stl-util.cpp (modified) (4 diffs)

cpp/common/stl-util.cpp

@@ -21 +21 @@
 {
         string s; //clang crashed when this declaration was in s=buf
-        long size = 256;
+        int size = 256;
         char* buf;
         va_list ap_copy; // "va_list ap" can only by used once by printf-type functions as they advance the current argument pointer (crashed on linux x86_64)
@@ -151 +151 @@
 string stripExt(const string& filename)
 {
-        int dot = filename.rfind('.');
+        size_t dot = filename.rfind('.');
         if (dot == string::npos) return filename;
-        int sep = filename.rfind(PATH_SEPARATOR_CHAR);
+        size_t sep = filename.rfind(PATH_SEPARATOR_CHAR);
         if ((sep == string::npos) || (sep < dot))
                 return filename.substr(0, dot);
@@ -161 +161 @@
 string getFileExt(const string& filename)
 {
-        int dot = filename.rfind('.');
+        size_t dot = filename.rfind('.');
         if (dot == string::npos) return string("");
-        int sep = filename.rfind(PATH_SEPARATOR_CHAR);
+        size_t sep = filename.rfind(PATH_SEPARATOR_CHAR);
         if ((sep == string::npos) || (sep < dot))
                 return filename.substr(dot);
@@ -171 +171 @@
 string getFileDir(const string& filename)
 {
-        int slash = filename.rfind(PATH_SEPARATOR_CHAR);
+        size_t slash = filename.rfind(PATH_SEPARATOR_CHAR);
         if (slash == string::npos) return string("");
         return filename.substr(0, slash);