4 files changed, 26 insertions, 12 deletions
diff --git a/src/google/protobuf/descriptor.cc b/src/google/protobuf/descriptor.cc
index 706e4bf9..d57b701f 100644
--- a/src/google/protobuf/descriptor.cc
+++ b/src/google/protobuf/descriptor.cc
@@ -204,9 +204,11 @@ struct PointerIntegerPairHash {
     return reinterpret_cast<intptr_t>(p.first) * ((1 << 16) - 1) + p.second;
   }
 
+#ifdef _MSC_VER
   // Used only by MSVC and platforms where hash_map is not available.
   static const size_t bucket_size = 4;
   static const size_t min_buckets = 8;
+#endif
   inline bool operator()(const PairType& a, const PairType& b) const {
     return a.first < b.first ||
           (a.first == b.first && a.second < b.second);
@@ -226,6 +228,10 @@ struct PointerStringPairHash {
   }
 
   // Used only by MSVC and platforms where hash_map is not available.
+  // These two lines produce unused warning, but do not delete them
+  // unless hash_map is available on MSVC and platforms.
+  static const size_t bucket_size = 4;
+  static const size_t min_buckets = 8;
   inline bool operator()(const PointerStringPair& a,
                          const PointerStringPair& b) const {
     if (a.first < b.first) return true;
diff --git a/src/google/protobuf/extension_set_unittest.cc b/src/google/protobuf/extension_set_unittest.cc
index 52e551cd..fb3746aa 100644
--- a/src/google/protobuf/extension_set_unittest.cc
+++ b/src/google/protobuf/extension_set_unittest.cc
@@ -812,8 +812,8 @@ TEST(ExtensionSetTest, RepeatedFields) {
   ASSERT_EQ(110, SumAllExtensions<double>(
       message, unittest::repeated_double_extension, 0));
 
-  typename RepeatedPtrField< ::std::string>::iterator string_iter;
-  typename RepeatedPtrField< ::std::string>::iterator string_end;
+  RepeatedPtrField< ::std::string>::iterator string_iter;
+  RepeatedPtrField< ::std::string>::iterator string_end;
   for (string_iter = message.MutableRepeatedExtension(
           unittest::repeated_string_extension)->begin(),
        string_end  = message.MutableRepeatedExtension(
@@ -821,8 +821,8 @@ TEST(ExtensionSetTest, RepeatedFields) {
        string_iter != string_end; ++string_iter) {
     *string_iter += "test";
   }
-  typename RepeatedPtrField< ::std::string>::const_iterator string_const_iter;
-  typename RepeatedPtrField< ::std::string>::const_iterator string_const_end;
+  RepeatedPtrField< ::std::string>::const_iterator string_const_iter;
+  RepeatedPtrField< ::std::string>::const_iterator string_const_end;
   for (string_const_iter = message.GetRepeatedExtension(
            unittest::repeated_string_extension).begin(),
        string_const_end  = message.GetRepeatedExtension(
@@ -831,8 +831,8 @@ TEST(ExtensionSetTest, RepeatedFields) {
     ASSERT_TRUE(*string_iter == "testtest");
   }
 
-  typename RepeatedField<unittest::TestAllTypes_NestedEnum>::iterator enum_iter;
-  typename RepeatedField<unittest::TestAllTypes_NestedEnum>::iterator enum_end;
+  RepeatedField<unittest::TestAllTypes_NestedEnum>::iterator enum_iter;
+  RepeatedField<unittest::TestAllTypes_NestedEnum>::iterator enum_end;
   for (enum_iter = message.MutableRepeatedExtension(
            unittest::repeated_nested_enum_extension)->begin(),
        enum_end  = message.MutableRepeatedExtension(
@@ -840,9 +840,9 @@ TEST(ExtensionSetTest, RepeatedFields) {
        enum_iter != enum_end; ++enum_iter) {
     *enum_iter = unittest::TestAllTypes::NestedEnum_MAX;
   }
-  typename RepeatedField<unittest::TestAllTypes_NestedEnum>::const_iterator
+  RepeatedField<unittest::TestAllTypes_NestedEnum>::const_iterator
       enum_const_iter;
-  typename RepeatedField<unittest::TestAllTypes_NestedEnum>::const_iterator
+  RepeatedField<unittest::TestAllTypes_NestedEnum>::const_iterator
       enum_const_end;
   for (enum_const_iter = message.GetRepeatedExtension(
            unittest::repeated_nested_enum_extension).begin(),
@@ -852,9 +852,9 @@ TEST(ExtensionSetTest, RepeatedFields) {
     ASSERT_EQ(*enum_const_iter, unittest::TestAllTypes::NestedEnum_MAX);
   }
 
-  typename RepeatedPtrField<unittest::TestAllTypes_NestedMessage>::iterator
+  RepeatedPtrField<unittest::TestAllTypes_NestedMessage>::iterator
       msg_iter;
-  typename RepeatedPtrField<unittest::TestAllTypes_NestedMessage>::iterator
+  RepeatedPtrField<unittest::TestAllTypes_NestedMessage>::iterator
       msg_end;
   for (msg_iter = message.MutableRepeatedExtension(
            unittest::repeated_nested_message_extension)->begin(),
@@ -863,9 +863,9 @@ TEST(ExtensionSetTest, RepeatedFields) {
        msg_iter != msg_end; ++msg_iter) {
     msg_iter->set_bb(1234);
   }
-  typename RepeatedPtrField<unittest::TestAllTypes_NestedMessage>::
+  RepeatedPtrField<unittest::TestAllTypes_NestedMessage>::
       const_iterator msg_const_iter;
-  typename RepeatedPtrField<unittest::TestAllTypes_NestedMessage>::
+  RepeatedPtrField<unittest::TestAllTypes_NestedMessage>::
       const_iterator msg_const_end;
   for (msg_const_iter = message.GetRepeatedExtension(
            unittest::repeated_nested_message_extension).begin(),
diff --git a/src/google/protobuf/repeated_field.h b/src/google/protobuf/repeated_field.h
index 93d3cbba..d1b23121 100644
--- a/src/google/protobuf/repeated_field.h
+++ b/src/google/protobuf/repeated_field.h
@@ -46,6 +46,10 @@
 #ifndef GOOGLE_PROTOBUF_REPEATED_FIELD_H__
 #define GOOGLE_PROTOBUF_REPEATED_FIELD_H__
 
+#ifdef _MSC_VER
+#include <algorithm>
+#endif
+
 #include <string>
 #include <iterator>
 #include <google/protobuf/stubs/common.h>
diff --git a/src/google/protobuf/wire_format_lite_inl.h b/src/google/protobuf/wire_format_lite_inl.h
index ba9f9ce3..2b5763ce 100644
--- a/src/google/protobuf/wire_format_lite_inl.h
+++ b/src/google/protobuf/wire_format_lite_inl.h
@@ -36,6 +36,10 @@
 #ifndef GOOGLE_PROTOBUF_WIRE_FORMAT_LITE_INL_H__
 #define GOOGLE_PROTOBUF_WIRE_FORMAT_LITE_INL_H__
 
+#ifdef _MSC_VER
+#include <algorithm>
+#endif
+
 #include <string>
 #include <google/protobuf/stubs/common.h>
 #include <google/protobuf/message_lite.h>