リビジョン | 9694fe612dea14259c8d17a334ba1b442da34973 (tree) |
---|---|
日時 | 2013-07-18 16:37:54 |
作者 | Katsuhiko Nishimra <ktns.87@gmai...> |
コミッター | Katsuhiko Nishimra |
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
@@ -58,25 +58,25 @@ void MolDSException::GetBacktrace(int bufsize){ | ||
58 | 58 | backtracePtr.reset(new void*[bufsize]); |
59 | 59 | this->backtraceSize = backtrace(this->backtracePtr.get(), bufsize); |
60 | 60 | if(this->backtraceSize==bufsize){ |
61 | - GetBacktrace(bufsize*2); | |
61 | + this->GetBacktrace(bufsize*2); | |
62 | 62 | } |
63 | 63 | } |
64 | 64 | |
65 | 65 | template<> |
66 | 66 | int MolDSException::GetKeyValue(int key){ |
67 | - return intKeyValueMap[key]; | |
67 | + return this->intKeyValueMap[key]; | |
68 | 68 | } |
69 | 69 | |
70 | 70 | /* |
71 | 71 | template<> |
72 | 72 | other MolDSException::GetKeyValue(int key){ |
73 | - return otherKeyValueMap[key]; | |
73 | + return this->otherKeyValueMap[key]; | |
74 | 74 | } |
75 | 75 | */ |
76 | 76 | |
77 | 77 | template<> |
78 | 78 | void MolDSException::SetKeyValue(int key, int value){ |
79 | - intKeyValueMap[key]=value; | |
79 | + this->intKeyValueMap[key]=value; | |
80 | 80 | } |
81 | 81 | |
82 | 82 | /* |
@@ -87,8 +87,8 @@ void MolDSException::SetKeyValue(int key, other value){ | ||
87 | 87 | */ |
88 | 88 | |
89 | 89 | 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; | |
92 | 92 | return false; |
93 | 93 | } |
94 | 94 |
@@ -96,7 +96,8 @@ const char* MolDSException::what() const throw(){ | ||
96 | 96 | static string str; |
97 | 97 | stringstream ss; |
98 | 98 | 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++){ | |
100 | 101 | ss << endl << '\t' << ExceptionKeyStr(i->first) << ":" << i->second; |
101 | 102 | } |
102 | 103 | char** backtraceSymbols = backtrace_symbols(this->backtracePtr.get(), |
@@ -106,7 +107,7 @@ const char* MolDSException::what() const throw(){ | ||
106 | 107 | } |
107 | 108 | else{ |
108 | 109 | ss << "\nbacktrace:"; |
109 | - for(int i = 0; i < backtraceSize; i++){ | |
110 | + for(int i = 0; i < this->backtraceSize; i++){ | |
110 | 111 | ss << endl << backtraceSymbols[i]; |
111 | 112 | } |
112 | 113 | } |
@@ -117,22 +118,22 @@ const char* MolDSException::what() const throw(){ | ||
117 | 118 | |
118 | 119 | template<class Archive> |
119 | 120 | void MolDSException::serialize(Archive& ar, const unsigned int ver){ |
120 | - ar & intKeyValueMap; | |
121 | - // ar & otherKeyValueMap; | |
121 | + ar & this->intKeyValueMap; | |
122 | + // ar & this->otherKeyValueMap; | |
122 | 123 | |
123 | - ar & backtraceSize; | |
124 | + ar & this->backtraceSize; | |
124 | 125 | if(!Archive::is_saving::value){ |
125 | - backtracePtr.reset(new void*[backtraceSize]); | |
126 | + this->backtracePtr.reset(new void*[this->backtraceSize]); | |
126 | 127 | } |
127 | 128 | for(int i; i<backtraceSize; i++){ |
128 | 129 | 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]); | |
130 | 131 | ar & p; |
131 | 132 | } |
132 | 133 | else{ |
133 | 134 | intptr_t p; |
134 | 135 | ar & p; |
135 | - backtracePtr[i]=reinterpret_cast<void*>(p); | |
136 | + this->backtracePtr[i]=reinterpret_cast<void*>(p); | |
136 | 137 | } |
137 | 138 | } |
138 | 139 | } |