Skip to content

P
protobuf
Commit 31b3bd98 authored by Jisi Liu's avatar Jisi Liu
Browse files
Options

Make compilers without ref-qualifier support happy.

parent d2f3adb3
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 2 deletions
src/google/protobuf/text_format.cc
View file @ 31b3bd98
...@@ -1414,7 +1414,9 @@ class StringBaseTextGenerator : public TextFormat::BaseTextGenerator { ...@@ -1414,7 +1414,9 @@ class StringBaseTextGenerator : public TextFormat::BaseTextGenerator {
public: public:
void Print(const char* text, size_t size) { output_.append(text, size); } 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_); } string Consume() && { return std::move(output_); }
#else // !LANG_CXX11 #else // !LANG_CXX11
const string& Get() { return output_; } const string& Get() { return output_; }
...@@ -1432,7 +1434,7 @@ class StringBaseTextGenerator : public TextFormat::BaseTextGenerator { ...@@ -1432,7 +1434,7 @@ class StringBaseTextGenerator : public TextFormat::BaseTextGenerator {
TextFormat::FieldValuePrinter::FieldValuePrinter() {} TextFormat::FieldValuePrinter::FieldValuePrinter() {}
TextFormat::FieldValuePrinter::~FieldValuePrinter() {} TextFormat::FieldValuePrinter::~FieldValuePrinter() {}
#if LANG_CXX11 #if 0 // LANG_CXX11
#define FORWARD_IMPL(fn, ...) \ #define FORWARD_IMPL(fn, ...) \
StringBaseTextGenerator generator; \ StringBaseTextGenerator generator; \
delegate_.fn(__VA_ARGS__, &generator); \ delegate_.fn(__VA_ARGS__, &generator); \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment