summaryrefslogtreecommitdiff
path: root/src/cstore/unionfs/cstore-unionfs.cpp
diff options
context:
space:
mode:
authorKim Hagen <kim.sidney@gmail.com>2017-08-28 13:32:42 +0200
committerKim Hagen <kim.sidney@gmail.com>2017-08-28 13:32:42 +0200
commit512e68c8161d1ccbd4ff819d9b1d622fee650215 (patch)
tree8da837549dae7158dbeac545b15ae0b1177ca02a /src/cstore/unionfs/cstore-unionfs.cpp
parent631b04c197efd9b20e66fa57ea4869525557c013 (diff)
downloadvyatta-cfg-512e68c8161d1ccbd4ff819d9b1d622fee650215.tar.gz
vyatta-cfg-512e68c8161d1ccbd4ff819d9b1d622fee650215.zip
fix compilation errors on newer gcc
Diffstat (limited to 'src/cstore/unionfs/cstore-unionfs.cpp')
-rw-r--r--src/cstore/unionfs/cstore-unionfs.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/cstore/unionfs/cstore-unionfs.cpp b/src/cstore/unionfs/cstore-unionfs.cpp
index 858a204..a990f03 100644
--- a/src/cstore/unionfs/cstore-unionfs.cpp
+++ b/src/cstore/unionfs/cstore-unionfs.cpp
@@ -179,7 +179,7 @@ vector<int> getActiveCommits()
int pid = atoi(dirp->d_name);
if (pid > 0) {
string command_path = string("/proc/") + dirp->d_name + "/cmdline";
- ifstream command_file(command_path.c_str());
+ std::ifstream command_file(command_path.c_str());
string command_line;
getline(command_file, command_line);
if (!command_line.empty()) {
@@ -1513,8 +1513,8 @@ UnionfsCstore::write_file(const char *file, const string& data, bool append)
b_fs::create_directories(ppath.path_cstr());
// write the file
- ofstream fout;
- fout.exceptions(ofstream::failbit | ofstream::badbit);
+ std::ofstream fout;
+ fout.exceptions(std::ofstream::failbit | std::ofstream::badbit);
ios_base::openmode mflags = ios_base::out;
mflags |= ((!append || !path_exists(file))
? ios_base::trunc : ios_base::app); // truncate or append
@@ -1543,7 +1543,7 @@ UnionfsCstore::read_whole_file(const FsPath& fpath, string& data)
}
stringbuf sbuf;
- ifstream fin(fpath.path_cstr());
+ std::ifstream fin(fpath.path_cstr());
fin >> &sbuf;
fin.close();
/* note: if file contains just a newline => (eof() && fail())
@@ -1605,7 +1605,7 @@ UnionfsCstore::find_line_in_file(const FsPath& file, const string& line)
{
bool ret = false;
try {
- ifstream fin(file.path_cstr());
+ std::ifstream fin(file.path_cstr());
while (!fin.eof() && !fin.bad() && !fin.fail()) {
string in;
getline(fin, in);