From 31b3bd9811ad0035367bbdde12a42c6e9403f153 Mon Sep 17 00:00:00 2001 From: Jisi Liu Date: Fri, 11 Aug 2017 13:53:41 -0700 Subject: Make compilers without ref-qualifier support happy. --- src/google/protobuf/text_format.cc | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/google/protobuf/text_format.cc b/src/google/protobuf/text_format.cc index 1ebbdf86..f1d2e8bc 100644 --- a/src/google/protobuf/text_format.cc +++ b/src/google/protobuf/text_format.cc @@ -1414,7 +1414,9 @@ class StringBaseTextGenerator : public TextFormat::BaseTextGenerator { public: void Print(const char* text, size_t size) { output_.append(text, size); } -#if LANG_CXX11 +// Some compilers do not support ref-qualifiers even in C++11 mode. +// Disable the optimization for now and revisit it later. +#if 0 // LANG_CXX11 string Consume() && { return std::move(output_); } #else // !LANG_CXX11 const string& Get() { return output_; } @@ -1432,7 +1434,7 @@ class StringBaseTextGenerator : public TextFormat::BaseTextGenerator { TextFormat::FieldValuePrinter::FieldValuePrinter() {} TextFormat::FieldValuePrinter::~FieldValuePrinter() {} -#if LANG_CXX11 +#if 0 // LANG_CXX11 #define FORWARD_IMPL(fn, ...) \ StringBaseTextGenerator generator; \ delegate_.fn(__VA_ARGS__, &generator); \ -- cgit v1.2.3