amorfo77/inja
1
0
Fork 0
mirror of https://github.com/pantor/inja.git synced 2026-04-03 22:58:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Making it compatible with gcc 4.8 (#150)

Browse Source 
There is an inline function that assumes the compiler has copy elision
optimization which is actually not required until C++17. GCC 4.8 does it
but it requires the copy constructor to be defined which is not the case
for std::ifstream. Fixed by passing reference by parameter.

Co-authored-by: Rafael Lorenzo Alonso <ralorenz@cisco.com>
This commit is contained in:
Rafael Lorenzo Alonso
2020-07-15 16:53:30 +01:00
committed by GitHub
parent f31378edaa
commit 17175f70da
4 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
include/inja/environment.hpp
View File

@@ -157,7 +157,8 @@ public:
}
json load_json(const std::string &filename) {
std::ifstream file = open_file_or_throw(input_path + filename);
std::ifstream file;
open_file_or_throw(input_path + filename, file);
json j;
file >> j;
return j;

3
include/inja/parser.hpp
View File

@@ -540,7 +540,8 @@ public:
}
std::string load_file(nonstd::string_view filename) {
std::ifstream file = open_file_or_throw(static_cast<std::string>(filename));
std::ifstream file;
open_file_or_throw(static_cast<std::string>(filename), file);
std::string text((std::istreambuf_iterator<char>(file)), std::istreambuf_iterator<char>());
return text;
}

4
include/inja/utils.hpp
View File

@@ -13,15 +13,13 @@
namespace inja {
inline std::ifstream open_file_or_throw(const std::string &path) {
std::ifstream file;
inline void open_file_or_throw(const std::string &path, std::ifstream &file) {
file.exceptions(std::ifstream::failbit | std::ifstream::badbit);
try {
file.open(path);
} catch (const std::ios_base::failure & /*e*/) {
throw FileError("failed accessing file at '" + path + "'");
}
return file;
}
namespace string_view {

10
single_include/inja/inja.hpp
View File

@@ -1829,15 +1829,13 @@ struct Token {
namespace inja {
inline std::ifstream open_file_or_throw(const std::string &path) {
std::ifstream file;
inline void open_file_or_throw(const std::string &path, std::ifstream &file) {
file.exceptions(std::ifstream::failbit | std::ifstream::badbit);
try {
file.open(path);
} catch (const std::ios_base::failure & /*e*/) {
throw FileError("failed accessing file at '" + path + "'");
}
return file;
}
namespace string_view {
@@ -3222,7 +3220,8 @@ public:
}
std::string load_file(nonstd::string_view filename) {
std::ifstream file = open_file_or_throw(static_cast<std::string>(filename));
std::ifstream file;
open_file_or_throw(static_cast<std::string>(filename), file);
std::string text((std::istreambuf_iterator<char>(file)), std::istreambuf_iterator<char>());
return text;
}
@@ -3971,7 +3970,8 @@ public:
}
json load_json(const std::string &filename) {
std::ifstream file = open_file_or_throw(input_path + filename);
std::ifstream file;
open_file_or_throw(input_path + filename, file);
json j;
file >> j;
return j;