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

fixes #11194 (#11242)

Browse source
This commit is contained in:
Arne Döring 2019-05-14 01:28:44 +02:00 • committed by Andreas Rumpf
commit 55cf971adf
2 changed files with 14 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

5
compiler/cgen.nim
View file

@ -1695,13 +1695,12 @@ proc genModule(m: BModule, cfile: Cfile): Rope =
result = getFileHeader(m.config, cfile) result = getFileHeader(m.config, cfile)
result.add(genMergeInfo(m)) result.add(genMergeInfo(m))
if m.config.cppCustomNamespace.len > 0:
result.add openNamespaceNim(m.config.cppCustomNamespace)
generateThreadLocalStorage(m) generateThreadLocalStorage(m)
generateHeaders(m) generateHeaders(m)
add(result, genSectionStart(cfsHeaders, m.config)) add(result, genSectionStart(cfsHeaders, m.config))
add(result, m.s[cfsHeaders]) add(result, m.s[cfsHeaders])
if m.config.cppCustomNamespace.len > 0:
result.add openNamespaceNim(m.config.cppCustomNamespace)
add(result, genSectionEnd(cfsHeaders, m.config)) add(result, genSectionEnd(cfsHeaders, m.config))
add(result, genSectionStart(cfsFrameDefines, m.config)) add(result, genSectionStart(cfsFrameDefines, m.config))
if m.s[cfsFrameDefines].len > 0: if m.s[cfsFrameDefines].len > 0:

12
tests/compiler/tcppCompileToNamespace.nim Normal file
View file

@ -0,0 +1,12 @@
discard """
cmd: "nim cpp --cppCompileToNamespace:foo $options -r $file"
target: cpp
"""
# Theoretically nim could just ignore the flag cppCompileToNamespace
# and this test would pass. Setting ``ccodeCheck`` for a c++ target
# doesn't work.
import os
echo "a" / "b"