anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-12-22 05:16:21 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix compilation with gcc 4.6

Browse Source
This commit is contained in:
Guillaume Munch 2016-06-14 16:42:52 +01:00
parent 947c34364c
commit b148629d56
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/support/unicode.cpp
View File

@ -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_)

4
src/support/unicode.h
View File

@ -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