Integrated internal changes from Google

1 files changed, 13 insertions, 1 deletions

diff --git a/src/google/protobuf/stubs/common.h b/src/google/protobuf/stubs/common.h
index 04660b81..2fe8a98b 100644
--- a/src/google/protobuf/stubs/common.h
+++ b/src/google/protobuf/stubs/common.h
@@ -38,6 +38,7 @@
 #include <algorithm>
 #include <iostream>
 #include <map>
+#include <memory>
 #include <set>
 #include <string>
 #include <vector>
@@ -48,7 +49,6 @@
 
 // TODO(liujisi): Remove the following includes after the include clean-up.
 #include <google/protobuf/stubs/logging.h>
-#include <google/protobuf/stubs/scoped_ptr.h>
 #include <google/protobuf/stubs/mutex.h>
 #include <google/protobuf/stubs/callback.h>
 
@@ -231,6 +231,18 @@ class FatalException : public std::exception {
 // in some versions of MSVC.
 using std::string;
 
+// TODO(gerbens) remove once an extraction cycle has removed all references
+namespace internal {
+template <typename T>
+using scoped_ptr = std::unique_ptr<T>;
+template <typename T>
+using scoped_array = std::unique_ptr<T[]>;
+}  // namespace internal
+template <typename T>
+using scoped_ptr = std::unique_ptr<T>;
+template <typename T>
+using scoped_array = std::unique_ptr<T[]>;
+
 }  // namespace protobuf
 }  // namespace google