diff options
| -rw-r--r-- | includes/Exceptions.h | 6 | ||||
| -rw-r--r-- | includes/TaskMan.h | 4 | ||||
| -rw-r--r-- | src/Exceptions.cc | 8 |
3 files changed, 9 insertions, 9 deletions
diff --git a/includes/Exceptions.h b/includes/Exceptions.h index 53c4949..2b20e1e 100644 --- a/includes/Exceptions.h +++ b/includes/Exceptions.h @@ -131,10 +131,10 @@ static inline void TestHelper(const String & msg) throw (TestException) { template<typename T> ClassName::ClassName(T * ptr) { #ifdef _MSC_VER - m_demangled = strdup(typeid(*ptr).name()); + m_demangled = strdup(typeid(*ptr).name()); #else - int status; - m_demangled = abi::__cxa_demangle(typeid(*ptr).name(), 0, 0, &status); + int status; + m_demangled = abi::__cxa_demangle(typeid(*ptr).name(), 0, 0, &status); #endif } diff --git a/includes/TaskMan.h b/includes/TaskMan.h index e187a56..eae78b9 100644 --- a/includes/TaskMan.h +++ b/includes/TaskMan.h @@ -88,9 +88,9 @@ class TaskMan { template<class T> friend T * createAsyncOp(T * op); #ifdef _MSC_VER - typedef stdext::hash_set<Task *> taskHash_t; + typedef stdext::hash_set<Task *> taskHash_t; #else - struct taskHasher { size_t operator()(const Task * t) const { return reinterpret_cast<uintptr_t>(t); } }; + struct taskHasher { size_t operator()(const Task * t) const { return reinterpret_cast<uintptr_t>(t); } }; typedef gnu::hash_set<Task *, taskHasher> taskHash_t; #endif taskHash_t m_tasks, m_signaledTasks; diff --git a/src/Exceptions.cc b/src/Exceptions.cc index b4646ce..38fa005 100644 --- a/src/Exceptions.cc +++ b/src/Exceptions.cc @@ -32,11 +32,11 @@ void Balau::GeneralException::genTrace() { #ifndef _MSC_VER char * demangled = abi::__cxa_demangle(symbol->Name, 0, 0, &status); #else - char * demangled = NULL; + char * demangled = NULL; #endif - line.set("%i: 0x%08x (%s)", i, symbol->Address, status == 0 && demangled ? demangled : symbol->Name); - if (demangled) - free(demangled); + line.set("%i: 0x%08x (%s)", i, symbol->Address, status == 0 && demangled ? demangled : symbol->Name); + if (demangled) + free(demangled); m_trace.push_back(line); } |