Skip to content

P
protobuf
Unverified Commit 14e8852f authored by Ludger Sprenker's avatar Ludger Sprenker Committed by GitHub
Browse files
Options

Fix -fpermissive: '<::' cannot begin a template-argument list 

'<:' is an alternate spelling for '['.
parent 9ab859f5
Show whitespace changes
Inline Side-by-side
Showing with 1 addition and 1 deletion
src/google/protobuf/arenastring.h
View file @ 14e8852f
...@@ -323,7 +323,7 @@ struct LIBPROTOBUF_EXPORT ArenaStringPtr { ...@@ -323,7 +323,7 @@ struct LIBPROTOBUF_EXPORT ArenaStringPtr {
const ::std::string* initial_value) { const ::std::string* initial_value) {
GOOGLE_DCHECK(initial_value != NULL); GOOGLE_DCHECK(initial_value != NULL);
// uses "new ::std::string" when arena is nullptr // uses "new ::std::string" when arena is nullptr
ptr_ = Arena::Create<::std::string>(arena, *initial_value); ptr_ = Arena::Create< ::std::string >(arena, *initial_value);
} }
GOOGLE_PROTOBUF_ATTRIBUTE_NOINLINE GOOGLE_PROTOBUF_ATTRIBUTE_NOINLINE
void CreateInstanceNoArena(const ::std::string* initial_value) { void CreateInstanceNoArena(const ::std::string* initial_value) {
......
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