mirrors/Nim
1
0
Fork 0
mirror of https://github.com/nim-lang/Nim.git synced 2025-12-28 17:04:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

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
parent 6fc74cec55
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.add(genMergeInfo(m))
if m.config.cppCustomNamespace.len > 0:
result.add openNamespaceNim(m.config.cppCustomNamespace)
generateThreadLocalStorage(m)
generateHeaders(m)
add(result, genSectionStart(cfsHeaders, m.config))
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, genSectionStart(cfsFrameDefines, m.config))
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"