diff options
| author | Adam Lesinski <adamlesinski@google.com> | 2016-04-07 17:03:54 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2016-04-07 17:03:55 +0000 |
| commit | f22df48067ec8f0a2c609c40ba842a0e5a0812b0 (patch) | |
| tree | 6b96e72963e8167058df90d7ce6eddc5e4b798f8 /tools/aapt2/java/JavaClassGenerator.cpp | |
| parent | c399df7a683d831f55b5afdb6945ef86bfe0e181 (diff) | |
| parent | 803c7c807969bea1f1c50f348832f5b60ad05d8e (diff) | |
Merge "AAPT2: Enable windows build and make sure it builds" into nyc-dev
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
| -rw-r--r-- | tools/aapt2/java/JavaClassGenerator.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/aapt2/java/JavaClassGenerator.cpp b/tools/aapt2/java/JavaClassGenerator.cpp index 092bab241bba..32b8600358b8 100644 --- a/tools/aapt2/java/JavaClassGenerator.cpp +++ b/tools/aapt2/java/JavaClassGenerator.cpp @@ -318,7 +318,7 @@ void JavaClassGenerator::addMembersToStyleableClass(const StringPiece16& package } std::unique_ptr<IntMember> indexMember = util::make_unique<IntMember>( - sortedAttributes[i].fieldName, i); + sortedAttributes[i].fieldName, static_cast<uint32_t>(i)); AnnotationProcessor* attrProcessor = indexMember->getCommentBuilder(); |