diff options
| author | Andreas Rumpf <rumpf_a@web.de> | 2018-06-04 16:16:50 +0200 |
|---|---|---|
| committer | Andreas Rumpf <rumpf_a@web.de> | 2018-06-04 16:16:50 +0200 |
| commit | 12996c08a1148125271a9b5f465c2ac44f261935 (patch) | |
| tree | 753257142359d8c2385b06a0f2487cae9c8679fe /compiler/cgen.nim | |
| parent | 2e9d486378965046227517f15a311cb72a84009e (diff) | |
| parent | 582786d0684b76a5bab5faa54304b2873bdcff5e (diff) | |
| download | Nim-12996c08a1148125271a9b5f465c2ac44f261935.tar.gz | |
fixed merge conflict
Diffstat (limited to 'compiler/cgen.nim')
| -rw-r--r-- | compiler/cgen.nim | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/compiler/cgen.nim b/compiler/cgen.nim index bf3c3a851..c66b25b00 100644 --- a/compiler/cgen.nim +++ b/compiler/cgen.nim @@ -1100,7 +1100,7 @@ proc getSomeInitName(m: PSym, suffix: string): Rope = if {sfSystemModule, sfMainModule} * m.flags == {}: result = m.owner.name.s.mangle.rope result.add "_" - result.add m.name.s + result.add m.name.s.mangle result.add suffix proc getInitName(m: PSym): Rope = |