From c8e6ed5d9fd672bdb828919c624a1c6ce44c40d0 Mon Sep 17 00:00:00 2001 From: Sebastian Messmer Date: Wed, 28 Oct 2015 00:42:49 +0100 Subject: [PATCH] Fix incompatibility with gcc 4.9 --- src/config/crypto/ConcreteInnerEncryptor.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/config/crypto/ConcreteInnerEncryptor.h b/src/config/crypto/ConcreteInnerEncryptor.h index 7a7949ce..7af8157f 100644 --- a/src/config/crypto/ConcreteInnerEncryptor.h +++ b/src/config/crypto/ConcreteInnerEncryptor.h @@ -62,7 +62,7 @@ namespace cryfs { } auto result = deserializer.readTailData(); 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) { 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.