Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 36db4ebb authored by Chih-Hung Hsieh's avatar Chih-Hung Hsieh Committed by android-build-merger
Browse files

Merge "Fix/suppress startop google-explicit-constructor warnings" am: 667dba5c am: b3bc82c7 

am: 4b4210f3

Change-Id: I18db8023d36fb1b0e18e6bd66d470dc1c3f3bb01
parents a640ed60 4b4210f3

startop/view_compiler/dex_builder.h

+2 −2
Original line number Diff line number Diff line
@@ -73,7 +73,7 @@ class TypeDescriptor { 
  bool operator<(const TypeDescriptor& rhs) const { return descriptor_ < rhs.descriptor_; }



 private:

  TypeDescriptor(std::string descriptor) : descriptor_{descriptor} {}

  explicit TypeDescriptor(std::string descriptor) : descriptor_{descriptor} {}



  const std::string descriptor_;

};
@@ -83,7 +83,7 @@ class TypeDescriptor { 
class Prototype {

 public:

  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...} {}



  // Encode this prototype into the dex file.

startop/view_compiler/main.cc

+1 −1
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@ DEFINE_string(package, "", "The package name for the generated class (required)" 


class ViewCompilerXmlVisitor : public XMLVisitor {

 public:

  ViewCompilerXmlVisitor(JavaLangViewBuilder* builder) : builder_(builder) {}

  explicit ViewCompilerXmlVisitor(JavaLangViewBuilder* builder) : builder_(builder) {}



  bool VisitEnter(const XMLDocument& /*doc*/) override {

    builder_->Start();