diff options
author | Matthias Schiffer <mschiffer@universe-factory.net> | 2015-02-06 19:51:20 +0100 |
---|---|---|
committer | Matthias Schiffer <mschiffer@universe-factory.net> | 2015-02-06 19:51:20 +0100 |
commit | d73c8b930b6c164a58621ae09a6cc727976e5657 (patch) | |
tree | 7920859c38ba48602af38ac7eb0d4113789df81c /src/MinedMap.cpp | |
parent | fb81ea7d60fa6fb879b6b35178405d6b034b9210 (diff) | |
download | MinedMap-d73c8b930b6c164a58621ae09a6cc727976e5657.tar MinedMap-d73c8b930b6c164a58621ae09a6cc727976e5657.zip |
Include cleanup
Also remove all uses of unistd.h by replacing unlink with std::rename
Diffstat (limited to 'src/MinedMap.cpp')
-rw-r--r-- | src/MinedMap.cpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/MinedMap.cpp b/src/MinedMap.cpp index 8624636..0193bbc 100644 --- a/src/MinedMap.cpp +++ b/src/MinedMap.cpp @@ -45,7 +45,6 @@ #include <fcntl.h> #include <sys/stat.h> #include <sys/time.h> -#include <unistd.h> namespace MinedMap { @@ -100,11 +99,11 @@ static void writeImage(const std::string &output, const uint8_t *data, bool colo if (std::rename(tmpfile.c_str(), output.c_str()) < 0) { std::fprintf(stderr, "Unable to save %s: %s\n", output.c_str(), std::strerror(errno)); - unlink(tmpfile.c_str()); + std::remove(tmpfile.c_str()); } } catch (const std::exception& ex) { - unlink(tmpfile.c_str()); + std::remove(tmpfile.c_str()); throw; } } @@ -223,11 +222,11 @@ static bool makeMipmap(const std::string &dir, size_t level, size_t x, size_t z, if (std::rename(tmpfile.c_str(), output.c_str()) < 0) { std::fprintf(stderr, "Unable to save %s: %s\n", output.c_str(), std::strerror(errno)); - unlink(tmpfile.c_str()); + std::remove(tmpfile.c_str()); } } catch (const std::exception& ex) { - unlink(tmpfile.c_str()); + std::remove(tmpfile.c_str()); throw; } |