• R/O
  • HTTP
  • SSH
  • HTTPS

提交

标签
No Tags

Frequently used words (click to add to your profile)

javac++androidlinuxc#windowsobjective-ccocoa誰得qtpythonphprubygameguibathyscaphec計画中(planning stage)翻訳omegatframeworktwitterdomtestvb.netdirectxゲームエンジンbtronarduinopreviewer

Commit MetaInfo

修订版9694fe612dea14259c8d17a334ba1b442da34973 (tree)
时间2013-07-18 16:37:54
作者Katsuhiko Nishimra <ktns.87@gmai...>
CommiterKatsuhiko Nishimra

Log Message

Add "this->" in order to follow the coding convention.

git-svn-id: https://svn.sourceforge.jp/svnroot/molds/trunk@1410 1136aad2-a195-0410-b898-f5ea1d11b9d8

更改概述

差异

--- a/src/base/MolDSException.cpp
+++ b/src/base/MolDSException.cpp
@@ -58,25 +58,25 @@ void MolDSException::GetBacktrace(int bufsize){
5858 backtracePtr.reset(new void*[bufsize]);
5959 this->backtraceSize = backtrace(this->backtracePtr.get(), bufsize);
6060 if(this->backtraceSize==bufsize){
61- GetBacktrace(bufsize*2);
61+ this->GetBacktrace(bufsize*2);
6262 }
6363 }
6464
6565 template<>
6666 int MolDSException::GetKeyValue(int key){
67- return intKeyValueMap[key];
67+ return this->intKeyValueMap[key];
6868 }
6969
7070 /*
7171 template<>
7272 other MolDSException::GetKeyValue(int key){
73- return otherKeyValueMap[key];
73+ return this->otherKeyValueMap[key];
7474 }
7575 */
7676
7777 template<>
7878 void MolDSException::SetKeyValue(int key, int value){
79- intKeyValueMap[key]=value;
79+ this->intKeyValueMap[key]=value;
8080 }
8181
8282 /*
@@ -87,8 +87,8 @@ void MolDSException::SetKeyValue(int key, other value){
8787 */
8888
8989 bool MolDSException::HasKey(int key){
90- if(!(intKeyValueMap.find(key)==intKeyValueMap.end())) return true;
91- //if(otherKeyValueMap.find(key)!=otherKeyValueMap::end) return true;
90+ if(!(this->intKeyValueMap.find(key)==this->intKeyValueMap.end())) return true;
91+ //if(this->otherKeyValueMap.find(key)!=this->otherKeyValueMap::end) return true;
9292 return false;
9393 }
9494
@@ -96,7 +96,8 @@ const char* MolDSException::what() const throw(){
9696 static string str;
9797 stringstream ss;
9898 ss << domain_error::what() << "\nkey value pairs:";
99- for(intKeyValueMap_t::const_iterator i = intKeyValueMap.begin(); i != intKeyValueMap.end(); i++){
99+ for(intKeyValueMap_t::const_iterator i = this->intKeyValueMap.begin();
100+ i != this->intKeyValueMap.end(); i++){
100101 ss << endl << '\t' << ExceptionKeyStr(i->first) << ":" << i->second;
101102 }
102103 char** backtraceSymbols = backtrace_symbols(this->backtracePtr.get(),
@@ -106,7 +107,7 @@ const char* MolDSException::what() const throw(){
106107 }
107108 else{
108109 ss << "\nbacktrace:";
109- for(int i = 0; i < backtraceSize; i++){
110+ for(int i = 0; i < this->backtraceSize; i++){
110111 ss << endl << backtraceSymbols[i];
111112 }
112113 }
@@ -117,22 +118,22 @@ const char* MolDSException::what() const throw(){
117118
118119 template<class Archive>
119120 void MolDSException::serialize(Archive& ar, const unsigned int ver){
120- ar & intKeyValueMap;
121- // ar & otherKeyValueMap;
121+ ar & this->intKeyValueMap;
122+ // ar & this->otherKeyValueMap;
122123
123- ar & backtraceSize;
124+ ar & this->backtraceSize;
124125 if(!Archive::is_saving::value){
125- backtracePtr.reset(new void*[backtraceSize]);
126+ this->backtracePtr.reset(new void*[this->backtraceSize]);
126127 }
127128 for(int i; i<backtraceSize; i++){
128129 if(Archive::is_saving::value){
129- intptr_t p = reinterpret_cast<intptr_t>(backtracePtr[i]);
130+ intptr_t p = reinterpret_cast<intptr_t>(this->backtracePtr[i]);
130131 ar & p;
131132 }
132133 else{
133134 intptr_t p;
134135 ar & p;
135- backtracePtr[i]=reinterpret_cast<void*>(p);
136+ this->backtracePtr[i]=reinterpret_cast<void*>(p);
136137 }
137138 }
138139 }