diff options
author | Ronny Krüger <rcane@rkxs.de> | 2018-04-16 09:58:24 +0200 |
---|---|---|
committer | Ronny Krüger <rcane@rkxs.de> | 2018-04-16 09:58:24 +0200 |
commit | 7d6d5f91320af20d77d57a198c54abe6e36a00ea (patch) | |
tree | a91c80c18a70f70ac5f8b94fb9951baa608d268d /src/google/protobuf/compiler/java/java_file.cc | |
parent | 320d56c833f835f40c56bdaf2a375768cdd1b334 (diff) | |
download | protobuf-7d6d5f91320af20d77d57a198c54abe6e36a00ea.tar.gz protobuf-7d6d5f91320af20d77d57a198c54abe6e36a00ea.tar.bz2 protobuf-7d6d5f91320af20d77d57a198c54abe6e36a00ea.zip |
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<std::unique_ptr<Foo> []> 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<std::unique_ptr<Foo>> foos;
This not only fixes the compiler error but is also more readable than
previous version.
Diffstat (limited to 'src/google/protobuf/compiler/java/java_file.cc')
-rw-r--r-- | src/google/protobuf/compiler/java/java_file.cc | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/google/protobuf/compiler/java/java_file.cc b/src/google/protobuf/compiler/java/java_file.cc index 5ee04e5a..d8f11d80 100644 --- a/src/google/protobuf/compiler/java/java_file.cc +++ b/src/google/protobuf/compiler/java/java_file.cc @@ -186,10 +186,8 @@ FileGenerator::FileGenerator(const FileDescriptor* file, const Options& options, bool immutable_api) : file_(file), java_package_(FileJavaPackage(file, immutable_api)), - message_generators_( - new std::unique_ptr<MessageGenerator>[file->message_type_count()]), - extension_generators_( - new std::unique_ptr<ExtensionGenerator>[file->extension_count()]), + message_generators_(file->message_type_count()), + extension_generators_(file->extension_count()), context_(new Context(file, options)), name_resolver_(context_->GetNameResolver()), options_(options), |