Merge branch 'devel' into araq

2017-11-02 10:46:30 +01:00 · 2017-11-02 10:46:30 +01:00 · 1eaeccc15d
commit 1eaeccc15d
parent e9243a1616 bd19b5f4d3
616 changed files with 73547 additions and 36764 deletions
--- a/lib/system/excpt.nim
+++ b/lib/system/excpt.nim
@ -306,8 +306,12 @@ proc raiseExceptionAux(e: ref Exception) =
        add(buf, " [")
        xadd(buf, e.name, e.name.len)
        add(buf, "]\n")
-        unhandled(buf):
-          showErrorMessage(buf)
+        when defined(nimNoArrayToCstringConversion):
+          template tbuf(): untyped = addr buf
+        else:
+          template tbuf(): untyped = buf
+        unhandled(tbuf()):
+          showErrorMessage(tbuf())
          quitOrDebug()

 proc raiseException(e: ref Exception, ename: cstring) {.compilerRtl.} =