summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2016-04-30 17:28:37 +0300
committerAndrei Karas <akaras@inbox.ru>2016-04-30 17:28:37 +0300
commitf8b6f8cbb252054404b2716960972669f4047a9f (patch)
treec6adda65656791c00a658bb607142bcab9221a51
parent61adaf9555e0e730f5ac1e8996923c0abe7f5782 (diff)
downloadmv-f8b6f8cbb252054404b2716960972669f4047a9f.tar.gz
mv-f8b6f8cbb252054404b2716960972669f4047a9f.tar.bz2
mv-f8b6f8cbb252054404b2716960972669f4047a9f.tar.xz
mv-f8b6f8cbb252054404b2716960972669f4047a9f.zip
Fix some clang issues.
-rw-r--r--src/utils/checkutils.cpp2
-rw-r--r--src/utils/physfstools.cpp2
-rw-r--r--src/utils/process.cpp3
3 files changed, 5 insertions, 2 deletions
diff --git a/src/utils/checkutils.cpp b/src/utils/checkutils.cpp
index 8f3e5c337..20c22df46 100644
--- a/src/utils/checkutils.cpp
+++ b/src/utils/checkutils.cpp
@@ -73,7 +73,7 @@ void reportStack(const char *const file,
text,
func);
#if defined __linux__ || defined __linux
- size = (int)backtrace(array, 15);
+ size = static_cast<int>(backtrace(array, 15));
strings = backtrace_symbols(array, size);
for (i = 0; i < size; i++)
logger->log1(strings[i]);
diff --git a/src/utils/physfstools.cpp b/src/utils/physfstools.cpp
index 6f4345c36..1e2ef1e2e 100644
--- a/src/utils/physfstools.cpp
+++ b/src/utils/physfstools.cpp
@@ -54,7 +54,7 @@ namespace PhysFs
_exit(1);
}
updateDirSeparator();
- atexit((void(*)()) PHYSFS_deinit);
+ atexit(reinterpret_cast<void(*)()>(PHYSFS_deinit));
}
void updateDirSeparator()
diff --git a/src/utils/process.cpp b/src/utils/process.cpp
index a12fb4301..a1c9d8a72 100644
--- a/src/utils/process.cpp
+++ b/src/utils/process.cpp
@@ -212,7 +212,10 @@ bool execFile(const std::string &pathName, const std::string &name,
arg2.c_str(), static_cast<char *>(nullptr));
}
_exit(-1);
+ PRAGMA45(GCC diagnostic push)
+ PRAGMA45(GCC diagnostic ignored "-Wunreachable-code-return")
return false;
+ PRAGMA45(GCC diagnostic pop)
}
return true;
}