Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix/suppress startop google-explicit-constructor warnings"

Browse Source 
am: 667dba5c14

Change-Id: I1dd95d363eee3fa58752efec4d895b7990c4cba0
This commit is contained in:
Chih-Hung Hsieh
2018-12-20 22:03:26 -08:00
committed by android-build-merger
parent 2e2028aee4 667dba5c14
commit b3bc82c7f5
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
startop/view_compiler/dex_builder.h
View File

@@ -73,7 +73,7 @@ class TypeDescriptor {
bool operator<(const TypeDescriptor& rhs) const { return descriptor_ < rhs.descriptor_; } bool operator<(const TypeDescriptor& rhs) const { return descriptor_ < rhs.descriptor_; }
private: private:
TypeDescriptor(std::string descriptor) : descriptor_{descriptor} {} explicit TypeDescriptor(std::string descriptor) : descriptor_{descriptor} {}
const std::string descriptor_; const std::string descriptor_;
}; };
@@ -83,7 +83,7 @@ class TypeDescriptor {
class Prototype { class Prototype {
public: public:
template <typename... TypeDescriptors> template <typename... TypeDescriptors>
Prototype(TypeDescriptor return_type, TypeDescriptors... param_types) explicit Prototype(TypeDescriptor return_type, TypeDescriptors... param_types)
: return_type_{return_type}, param_types_{param_types...} {} : return_type_{return_type}, param_types_{param_types...} {}
// Encode this prototype into the dex file. // Encode this prototype into the dex file.

2
startop/view_compiler/main.cc
View File

@@ -42,7 +42,7 @@ DEFINE_string(package, "", "The package name for the generated class (required)"
class ViewCompilerXmlVisitor : public XMLVisitor { class ViewCompilerXmlVisitor : public XMLVisitor {
public: public:
ViewCompilerXmlVisitor(JavaLangViewBuilder* builder) : builder_(builder) {} explicit ViewCompilerXmlVisitor(JavaLangViewBuilder* builder) : builder_(builder) {}
bool VisitEnter(const XMLDocument& /*doc*/) override { bool VisitEnter(const XMLDocument& /*doc*/) override {
builder_->Start(); builder_->Start();