commit 955724179c6c739524f610023287f56b24dc31de
author Elliott Hughes <enh@google.com> Tue Dec 13 18:14:20 2011 -0800
committer Elliott Hughes <enh@google.com> Tue Dec 13 18:14:20 2011 -0800
tree 64f751693e72173ae0d044d8c54989b01f1195af
parent b87f73ea7524f6eb9da6da1af931a3d3fbb833ff

Don't default-construct std::strings and then assign them.

Change-Id: I8c994d1e6a8d2ebe52eaa4f0132e0deb2ecfa5f3

src/common_test.h

diff --git a/src/common_test.h b/src/common_test.h
index 48a9c39..5093976 100644
--- a/src/common_test.h
+++ b/src/common_test.h
@@ -297,7 +297,7 @@
   }
 
   const DexFile* GetLibCoreDex() {
-    std::string libcore_dex_file_name = GetLibCoreDexFileName();
+    std::string libcore_dex_file_name(GetLibCoreDexFileName());
     return DexFile::Open(libcore_dex_file_name, "");
   }
 
@@ -330,7 +330,7 @@
   }
 
   void CompileClass(const ClassLoader* class_loader, const char* class_name) {
-    std::string class_descriptor = DotToDescriptor(class_name);
+    std::string class_descriptor(DotToDescriptor(class_name));
     Class* klass = class_linker_->FindClass(class_descriptor, class_loader);
     CHECK(klass != NULL) << "Class not found " << class_name;
     for (size_t i = 0; i < klass->NumDirectMethods(); i++) {
@@ -353,7 +353,7 @@
                            const char* class_name,
                            const char* method_name,
                            const char* signature) {
-    std::string class_descriptor = DotToDescriptor(class_name);
+    std::string class_descriptor(DotToDescriptor(class_name));
     Class* klass = class_linker_->FindClass(class_descriptor, class_loader);
     CHECK(klass != NULL) << "Class not found " << class_name;
     Method* method = klass->FindDirectMethod(method_name, signature);
@@ -366,7 +366,7 @@
                             const char* class_name,
                             const char* method_name,
                             const char* signature) {
-    std::string class_descriptor = DotToDescriptor(class_name);
+    std::string class_descriptor(DotToDescriptor(class_name));
     Class* klass = class_linker_->FindClass(class_descriptor, class_loader);
     CHECK(klass != NULL) << "Class not found " << class_name;
     Method* method = klass->FindVirtualMethod(method_name, signature);