Fix compilation with gcc 4.6

diff --git a/src/support/unicode.cpp b/src/support/unicode.cpp
index 187d018f2bc03da066e011483d6c3b0e21cff8cf..adec55299c552221a6fbb7c8aef2657e9c1df9b3 100644 (file)
--- a/src/support/unicode.cpp
+++ b/src/support/unicode.cpp
@@ -66,6 +66,13 @@ IconvProcessor::IconvProcessor(string tocode, string fromcode)
 {}
 
 
+// for gcc 4.6
+IconvProcessor::IconvProcessor(IconvProcessor && other)
+       : tocode_(move(other.tocode_)), fromcode_(move(other.fromcode_)),
+         h_(move(other.h_))
+{}
+
+
 bool IconvProcessor::init()
 {
        if (h_)

diff --git a/src/support/unicode.h b/src/support/unicode.h
index 6373e470ba0e446a192f08ea18f07f241b582437..17b95dd29079c7ad69ac7efa110647dd0cdd17a1 100644 (file)
--- a/src/support/unicode.h
+++ b/src/support/unicode.h
@@ -62,8 +62,8 @@ public:
                char * out_buffer, size_t max_out_size);
        /// target encoding
        std::string to() const { return tocode_; }
-       // required by g++ 4.7
-       IconvProcessor(IconvProcessor &&) = default;
+       // required by g++ 4.6
+       IconvProcessor(IconvProcessor && other);
 };
 
 /// Get the global IconvProcessor instance of the current thread for