commit 6c0b6176cdf020461e9af114fd943b57563b2110
author Greg Kaiser <gkaiser@google.com> Sun Mar 31 10:23:09 2019 -0700
committer android-build-merger <android-build-merger@google.com> Sun Mar 31 10:23:09 2019 -0700
tree b5481dbbf8e9607862e7a709093dc8d8465487a3
parent 5b0de71787d7fc1db785b6d9b87c0bd24bdd2e4e
parent bd01d2e2d8aa7a5a405c5c8d1660034da3b74279

Merge "Avoid extra std::string copies"
am: bd01d2e2d8

Change-Id: I52475dba3614cd089387ad1e8bd1920b42cc941e

slang.cpp

diff --git a/slang.cpp b/slang.cpp
index f942beb..25d518b 100644
--- a/slang.cpp
+++ b/slang.cpp
@@ -725,7 +725,7 @@
           if ((Opts.mOutputType == Slang::OT_Bitcode) &&
               (Opts.mBitcodeStorage == BCST_JAVA_CODE) &&
               !generateJavaBitcodeAccessor(Opts.mJavaReflectionPathBase,
-                                           RealPackageName.c_str(),
+                                           RealPackageName,
                                            mRSContext->getLicenseNote())) {
             return false;
           }

slang_rs_reflection.cpp

diff --git a/slang_rs_reflection.cpp b/slang_rs_reflection.cpp
index b2d226b..2c30e4f 100644
--- a/slang_rs_reflection.cpp
+++ b/slang_rs_reflection.cpp
@@ -1505,7 +1505,7 @@
     const std::string &InName = Args[InIdx].second;
     genTypeCheck(InTypes[InIdx], InName.c_str());
     if (InIdx > 0)
-      genPairwiseDimCheck(In0Name.c_str(), InName.c_str());
+      genPairwiseDimCheck(In0Name, InName);
   }
   // Create a temporary output allocation
   const char OutputAllocName[] = "aout";