From 7d6d5f91320af20d77d57a198c54abe6e36a00ea Mon Sep 17 00:00:00 2001 From: Ronny Krüger Date: Mon, 16 Apr 2018 09:58:24 +0200 Subject: Fixed a Visual Studio 2017 build error. (#4488) The current 15.6.x versions of Visual Studio 2017 contain a bug that prevent them from compiling the following construct under certain conditions: std::unique_ptr []> foos; This will fail to compile if Foo is an abstract class. To work-around the problem the whole construct was change into: std::vector> foos; This not only fixes the compiler error but is also more readable than previous version. --- src/google/protobuf/compiler/java/java_field.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/google/protobuf/compiler/java/java_field.h') diff --git a/src/google/protobuf/compiler/java/java_field.h b/src/google/protobuf/compiler/java/java_field.h index 04bbe24a..7275c099 100644 --- a/src/google/protobuf/compiler/java/java_field.h +++ b/src/google/protobuf/compiler/java/java_field.h @@ -138,7 +138,7 @@ class FieldGeneratorMap { const Descriptor* descriptor_; Context* context_; ClassNameResolver* name_resolver_; - std::unique_ptr []> field_generators_; + std::vector> field_generators_; GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(FieldGeneratorMap); }; -- cgit v1.2.3