summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorGravatar bunnei2014-08-18 15:35:47 -0400
committerGravatar bunnei2014-08-18 15:35:47 -0400
commit0a1aab5b4259b555e77554376d87cc641c4fe922 (patch)
tree209400d4a1f7652a127cb40e167c71cc8f755fc1 /src
parentMerge pull request #56 from xsacha/master (diff)
parentCommon: Don't return a reference to a string when calling GetName in symbols.cpp (diff)
downloadyuzu-0a1aab5b4259b555e77554376d87cc641c4fe922.tar.gz
yuzu-0a1aab5b4259b555e77554376d87cc641c4fe922.tar.xz
yuzu-0a1aab5b4259b555e77554376d87cc641c4fe922.zip
Merge pull request #57 from lioncash/str
Common: Don't return a reference to a string when calling GetName in symbols.cpp
Diffstat (limited to 'src')
-rw-r--r--src/common/symbols.cpp2
-rw-r--r--src/common/symbols.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/common/symbols.cpp b/src/common/symbols.cpp
index dcc9eeac5..d61f4c0c6 100644
--- a/src/common/symbols.cpp
+++ b/src/common/symbols.cpp
@@ -40,7 +40,7 @@ namespace Symbols
40 40
41 return symbol; 41 return symbol;
42 } 42 }
43 const std::string& GetName(u32 _address) 43 const std::string GetName(u32 _address)
44 { 44 {
45 return GetSymbol(_address).name; 45 return GetSymbol(_address).name;
46 } 46 }
diff --git a/src/common/symbols.h b/src/common/symbols.h
index b76749654..e59bc5dd4 100644
--- a/src/common/symbols.h
+++ b/src/common/symbols.h
@@ -32,7 +32,7 @@ namespace Symbols
32 32
33 void Add(u32 _address, const std::string& _name, u32 _size, u32 _type); 33 void Add(u32 _address, const std::string& _name, u32 _size, u32 _type);
34 TSymbol GetSymbol(u32 _address); 34 TSymbol GetSymbol(u32 _address);
35 const std::string& GetName(u32 _address); 35 const std::string GetName(u32 _address);
36 void Remove(u32 _address); 36 void Remove(u32 _address);
37 void Clear(); 37 void Clear();
38}; 38};