jyapayne/Nim
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Disable setTerminate when noCppExceptions is defined (#7751)

Browse source
This commit is contained in:
Emery Hemingway 2018-05-04 07:40:40 +02:00 • committed by Andreas Rumpf
commit cda591a42f
2 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
compiler/cgen.nim
View file

@ -265,7 +265,7 @@ proc rdCharLoc(a: TLoc): Rope =
proc genObjectInit(p: BProc, section: TCProcSection, t: PType, a: TLoc, proc genObjectInit(p: BProc, section: TCProcSection, t: PType, a: TLoc,
takeAddr: bool) = takeAddr: bool) =
if p.module.compileToCpp and t.isException: if p.module.compileToCpp and t.isException and not isDefined("noCppExceptions"):
# init vtable in Exception object for polymorphic exceptions # init vtable in Exception object for polymorphic exceptions
includeHeader(p.module, "<new>") includeHeader(p.module, "<new>")
linefmt(p, section, "new ($1) $2;$n", rdLoc(a), getTypeDesc(p.module, t)) linefmt(p, section, "new ($1) $2;$n", rdLoc(a), getTypeDesc(p.module, t))

5
lib/system.nim
View file

@ -4172,8 +4172,9 @@ template doAssertRaises*(exception, code: untyped): typed =
if wrong: if wrong:
raiseAssert(astToStr(exception) & " wasn't raised by:\n" & astToStr(code)) raiseAssert(astToStr(exception) & " wasn't raised by:\n" & astToStr(code))
when defined(cpp) and appType != "lib" and not defined(js) and when defined(cpp) and appType != "lib" and
not defined(nimscript) and hostOS != "standalone": not defined(js) and not defined(nimscript) and
hostOS != "standalone" and not defined(noCppExceptions):
proc setTerminate(handler: proc() {.noconv.}) proc setTerminate(handler: proc() {.noconv.})
{.importc: "std::set_terminate", header: "<exception>".} {.importc: "std::set_terminate", header: "<exception>".}
setTerminate proc() {.noconv.} = setTerminate proc() {.noconv.} =