diff options
| -rw-r--r-- | src/commit/commit-algorithm.cpp | 3 | ||||
| -rw-r--r-- | src/cstore/unionfs/cstore-unionfs.cpp | 2 | ||||
| -rw-r--r-- | src/cstore/unionfs/cstore-unionfs.hpp | 1 |
3 files changed, 4 insertions, 2 deletions
diff --git a/src/commit/commit-algorithm.cpp b/src/commit/commit-algorithm.cpp index a84fdf5..b1d689b 100644 --- a/src/commit/commit-algorithm.cpp +++ b/src/commit/commit-algorithm.cpp @@ -17,6 +17,7 @@ #include <unistd.h> #include <cstdio> +#include <cstdlib> #include <vector> #include <string> #include <chrono> @@ -473,7 +474,7 @@ _exec_multi_node_actions(Cstore& cs, const CfgNode& node, vtw_act_type act, #if __GNUC__ < 6 auto_ptr<char> at_str(strdup(v.c_str())); #else - unique_ptr<char> at_str(strdup(v.c_str())); + unique_ptr<char, decltype(&free)> at_str(strdup(v.c_str()), &free); #endif tr1::shared_ptr<Cpath> pdisp(new Cpath(pcomps)); pdisp->push(v); diff --git a/src/cstore/unionfs/cstore-unionfs.cpp b/src/cstore/unionfs/cstore-unionfs.cpp index e9aa7b2..8bb97db 100644 --- a/src/cstore/unionfs/cstore-unionfs.cpp +++ b/src/cstore/unionfs/cstore-unionfs.cpp @@ -1775,7 +1775,7 @@ UnionfsCstore::path_is_regular(const char *path) if (!b_fs_get_file_status(path, result)) { return false; } - return b_fs::is_regular(result); + return b_fs::is_regular_file(result); } bool diff --git a/src/cstore/unionfs/cstore-unionfs.hpp b/src/cstore/unionfs/cstore-unionfs.hpp index a56e9ec..f15b05b 100644 --- a/src/cstore/unionfs/cstore-unionfs.hpp +++ b/src/cstore/unionfs/cstore-unionfs.hpp @@ -16,6 +16,7 @@ #ifndef _CSTORE_UNIONFS_H_ #define _CSTORE_UNIONFS_H_ +#include <algorithm> #include <vector> #include <string> |