zorba-coders team mailing list archive
-
zorba-coders team
-
Mailing list archive
-
Message #12320
[Merge] lp:~zorba-coders/zorba/bug1025445 into lp:zorba
Rodolfo Ochoa has proposed merging lp:~zorba-coders/zorba/bug1025445 into lp:zorba.
Requested reviews:
Rodolfo Ochoa (rodolfo-ochoa)
Chris Hillery (ceejatec)
Related bugs:
Bug #1025445 in Zorba: "execinfo.h broke Windows build"
https://bugs.launchpad.net/zorba/+bug/1025445
For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/bug1025445/+merge/115239
Disabling "print stack trace" for windows
--
https://code.launchpad.net/~zorba-coders/zorba/bug1025445/+merge/115239
Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'src/store/naive/item.cpp'
--- src/store/naive/item.cpp 2012-07-12 17:29:55 +0000
+++ src/store/naive/item.cpp 2012-07-16 22:25:21 +0000
@@ -34,8 +34,10 @@
#include "runtime/function_item/function_item.h"
-# include <cstdlib>
-# include <execinfo.h>
+#include <cstdlib>
+#ifndef WIN32
+#include <execinfo.h>
+#endif
namespace zorba
@@ -495,6 +497,7 @@
}
+#ifndef WIN32
static void print_stack_trace( std::ostream& o )
{
int BUF_SIZE = 250;
@@ -514,7 +517,7 @@
o << "allocation of backtrace symbols failed" << std::endl;
}
}
-
+#endif
/**
* Accessor for xs:untypedAtomic and xs:string and its subtypes
@@ -536,8 +539,9 @@
std::cerr << "???????" << std::endl;
}
-
+#ifndef WIN32
print_stack_trace(std::cerr);
+#endif
throw ZORBA_EXCEPTION(
zerr::ZSTR0040_TYPE_ERROR,
Follow ups