Merge "android-5.1: use char constructor for default on c++ streams" into android-9.0
diff --git a/twrp-functions.cpp b/twrp-functions.cpp
index 4386ff6..a3e5a07 100755
--- a/twrp-functions.cpp
+++ b/twrp-functions.cpp
@@ -524,7 +524,7 @@
destLogBuffer.append(destFileBuffer);
}
} else if (Path_Exists(uncompressedLog)) {
- std::ifstream uncompressedIfs(uncompressedLog);
+ std::ifstream uncompressedIfs(uncompressedLog.c_str());
std::stringstream uncompressedSS;
uncompressedSS << uncompressedIfs.rdbuf();
uncompressedIfs.close();
@@ -533,7 +533,7 @@
std::remove(uncompressedLog.c_str());
}
- std::ifstream ifs(Source);
+ std::ifstream ifs(Source.c_str());
std::stringstream ss;
ss << ifs.rdbuf();
std::string srcLogBuffer(ss.str());
@@ -759,8 +759,8 @@
LOGINFO("Unable to find source file %s\n", src.c_str());
return -1;
}
- std::ifstream srcfile(src, ios::binary);
- std::ofstream dstfile(dst, ios::binary);
+ std::ifstream srcfile(src.c_str(), ios::binary);
+ std::ofstream dstfile(dst.c_str(), ios::binary);
dstfile << srcfile.rdbuf();
if (!dstfile.bad()) {
LOGINFO("Copied file %s to %s\n", src.c_str(), dst.c_str());