Date: Tuesday, December 19, 2006 @ 14:36:58
Author: marc
Path: /cvsroot/carob/carob/src
Modified: CarobException.cpp (1.25 -> 1.26)
Moved two local variables deeper in for loop to avoid "unused variable" warning
when CAROB_CXX_DEMANGLING is not defined.
--------------------+
CarobException.cpp | 7 +++----
1 files changed, 3 insertions(+), 4 deletions(-)
Index: carob/src/CarobException.cpp
diff -u carob/src/CarobException.cpp:1.25 carob/src/CarobException.cpp:1.26
--- carob/src/CarobException.cpp:1.25 Tue Dec 5 02:51:56 2006
+++ carob/src/CarobException.cpp Tue Dec 19 14:36:57 2006
@@ -168,9 +168,6 @@
std::wostream&
CarobNS::operator<< (std::wostream& outstream, const CarobNS::BackTrace&
stvect)
{
- int status;
- char *demangled;
-
for (CarobNS::BackTrace::const_iterator btframe = stvect.begin();
btframe != stvect.end(); btframe++) {
@@ -189,7 +186,9 @@
std::string mangled(sframe.substr(start, len));
- demangled = abi::__cxa_demangle(mangled.c_str(), 0, 0, &status);
+ int status;
+ char *demangled(abi::__cxa_demangle(mangled.c_str(), 0, 0,
&status));
+
if (demangled) {
sframe.replace(start, len, demangled);
free(demangled);
_______________________________________________
Carob-commits mailing list
[email protected]
https://forge.continuent.org/mailman/listinfo/carob-commits
