third_party/protobuf: Update to HEAD (83d681ee2c)

third_party/protobuf/src/google/protobuf/arenastring.cc

 // Protocol Buffers - Google's data interchange format
 // Copyright 2008 Google Inc.  All rights reserved.
 // https://developers.google.com/protocol-buffers/
 //
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
 //
 //     * Redistributions of source code must retain the above copyright
 // notice, this list of conditions and the following disclaimer.
@@ skipping 26 matching lines @@
 namespace protobuf {
 namespace internal {
 
 
 void ArenaStringPtr::AssignWithDefault(const ::std::string* default_value,
                                        ArenaStringPtr value) {
   const ::std::string* me = *UnsafeRawStringPointer();
   const ::std::string* other = *value.UnsafeRawStringPointer();
   // If the pointers are the same then do nothing.
   if (me != other) {
-    SetNoArena(default_value, value.GetNoArena(default_value));
+    SetNoArena(default_value, value.GetNoArena());
   }
 }
 
 ::std::string* ArenaStringPtr::MutableNoArena(
      const ::std::string* default_value) {
   if (ptr_ == default_value) {
     CreateInstanceNoArena(default_value);
   }
   return ptr_;
 }
 
 
 void ArenaStringPtr::DestroyNoArena(const ::std::string* default_value) {
   if (ptr_ != default_value) {
     delete ptr_;
   }
   ptr_ = NULL;
 }
 
 
 }  // namespace internal
 }  // namespace protobuf
 }  // namespace google