Pull new version of protobuf sources.

third_party/protobuf/src/google/protobuf/util/internal/object_location_tracker.h

Index: third_party/protobuf/src/google/protobuf/util/internal/object_location_tracker.h
diff --git a/third_party/protobuf/src/google/protobuf/compiler/cpp/cpp_options.h b/third_party/protobuf/src/google/protobuf/util/internal/object_location_tracker.h
similarity index 68%
copy from third_party/protobuf/src/google/protobuf/compiler/cpp/cpp_options.h
copy to third_party/protobuf/src/google/protobuf/util/internal/object_location_tracker.h
index 787706629bd10fc72eb7811d9498f19dd0524d11..8586cecc912178446793a2d6152b9d0fea02038c 100644
--- a/third_party/protobuf/src/google/protobuf/compiler/cpp/cpp_options.h
+++ b/third_party/protobuf/src/google/protobuf/util/internal/object_location_tracker.h
@@ -1,6 +1,6 @@
 // Protocol Buffers - Google's data interchange format
 // Copyright 2008 Google Inc.  All rights reserved.
-// http://code.google.com/p/protobuf/
+// 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
@@ -28,31 +28,37 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-// Author: rennie@google.com (Jeffrey Rennie)
-
-#ifndef GOOGLE_PROTOBUF_COMPILER_CPP_OPTIONS_H__
-#define GOOGLE_PROTOBUF_COMPILER_CPP_OPTIONS_H__
+#ifndef GOOGLE_PROTOBUF_UTIL_CONVERTER_OBJECT_LOCATION_TRACKER_H__
+#define GOOGLE_PROTOBUF_UTIL_CONVERTER_OBJECT_LOCATION_TRACKER_H__
 
 #include <string>
 
 #include <google/protobuf/stubs/common.h>
+#include <google/protobuf/util/internal/location_tracker.h>
+
 namespace google {
 namespace protobuf {
-namespace compiler {
-namespace cpp {
-
-// Generator options:
-struct Options {
-  Options() : safe_boundary_check(false) {
-  }
-  string dllexport_decl;
-  bool safe_boundary_check;
+namespace util {
+namespace converter {
+
+// An empty concrete implementation of LocationTrackerInterface.
+class ObjectLocationTracker : public LocationTrackerInterface {
+ public:
+  // Creates an empty location tracker.
+  ObjectLocationTracker() {}
+
+  virtual ~ObjectLocationTracker() {}
+
+  // Returns empty because nothing is tracked.
+  virtual string ToString() const { return ""; }
+
+ private:
+  GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(ObjectLocationTracker);
 };
 
-}  // namespace cpp
-}  // namespace compiler
+}  // namespace converter
+}  // namespace util
 }  // namespace protobuf
 
-
 }  // namespace google
-#endif  // GOOGLE_PROTOBUF_COMPILER_CPP_OPTIONS_H__
+#endif  // GOOGLE_PROTOBUF_UTIL_CONVERTER_OBJECT_LOCATION_TRACKER_H__