Index: third_party/protobuf/src/google/protobuf/arenastring.h |
diff --git a/third_party/protobuf/src/google/protobuf/arenastring.h b/third_party/protobuf/src/google/protobuf/arenastring.h |
index 1be3da67791d768d5ff1a7a3605c277c70c01843..d983cf6ce50f3ffe85a16d98f56575344900535b 100755 |
--- a/third_party/protobuf/src/google/protobuf/arenastring.h |
+++ b/third_party/protobuf/src/google/protobuf/arenastring.h |
@@ -64,7 +64,7 @@ struct LIBPROTOBUF_EXPORT ArenaStringPtr { |
} |
// Basic accessors. |
- inline const ::std::string& Get(const ::std::string* default_value) const { |
+ inline const ::std::string& Get(const ::std::string* /* default_value */) const { |
return *ptr_; |
} |
@@ -102,7 +102,7 @@ struct LIBPROTOBUF_EXPORT ArenaStringPtr { |
// state. Used to implement unsafe_arena_release_<field>() methods on |
// generated classes. |
inline ::std::string* UnsafeArenaRelease(const ::std::string* default_value, |
- ::google::protobuf::Arena* arena) { |
+ ::google::protobuf::Arena* /* arena */) { |
if (ptr_ == default_value) { |
return NULL; |
} |
@@ -134,7 +134,8 @@ struct LIBPROTOBUF_EXPORT ArenaStringPtr { |
// UnsafeArenaRelease() on another field of a message in the same arena. Used |
// to implement unsafe_arena_set_allocated_<field> in generated classes. |
inline void UnsafeArenaSetAllocated(const ::std::string* default_value, |
- ::std::string* value, ::google::protobuf::Arena* arena) { |
+ ::std::string* value, |
+ ::google::protobuf::Arena* /* arena */) { |
if (value != NULL) { |
ptr_ = value; |
} else { |
@@ -163,7 +164,7 @@ struct LIBPROTOBUF_EXPORT ArenaStringPtr { |
// the user) will always be the empty string. Assumes that |default_value| |
// is an empty string. |
inline void ClearToEmpty(const ::std::string* default_value, |
- ::google::protobuf::Arena* arena) { |
+ ::google::protobuf::Arena* /* arena */) { |
if (ptr_ == default_value) { |
// Already set to default (which is empty) -- do nothing. |
} else { |
@@ -175,7 +176,7 @@ struct LIBPROTOBUF_EXPORT ArenaStringPtr { |
// overhead of heap operations. After this returns, the content (as seen by |
// the user) will always be equal to |default_value|. |
inline void ClearToDefault(const ::std::string* default_value, |
- ::google::protobuf::Arena* arena) { |
+ ::google::protobuf::Arena* /* arena */) { |
if (ptr_ == default_value) { |
// Already set to default -- do nothing. |
} else { |
@@ -215,7 +216,7 @@ struct LIBPROTOBUF_EXPORT ArenaStringPtr { |
void AssignWithDefault(const ::std::string* default_value, ArenaStringPtr value); |
- inline const ::std::string& GetNoArena(const ::std::string* default_value) const { |
+ inline const ::std::string& GetNoArena(const ::std::string* /* default_value */) const { |
return *ptr_; |
} |