hardcoresushi/libcryfs
1
0
Fork 0
Code Issues Pull Requests Releases Activity

Fix incompatibility with gcc 4.9

Browse Source
This commit is contained in:
Sebastian Messmer 2015-10-28 00:42:49 +01:00
parent 0d5a7d9d10
commit c8e6ed5d9f
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/config/crypto/ConcreteInnerEncryptor.h
View File

@ -62,7 +62,7 @@ namespace cryfs {
} }
auto result = deserializer.readTailData(); auto result = deserializer.readTailData();
deserializer.finished(); deserializer.finished();
return result; return std::move(result); // TODO This std::move() is not necessary on newer gcc versions. Remove it and look for other occurrences of the same.
} catch (const std::exception &e) { } catch (const std::exception &e) {
cpputils::logging::LOG(cpputils::logging::ERROR) << "Error serializing inner configuration: " << e.what(); cpputils::logging::LOG(cpputils::logging::ERROR) << "Error serializing inner configuration: " << e.what();
return boost::none; // This can be caused by invalid input data and does not have to be a programming error. Don't throw exception. return boost::none; // This can be caused by invalid input data and does not have to be a programming error. Don't throw exception.