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

fixes broken merge

Browse source
This commit is contained in:
Araq 2015-07-02 16:29:22 +02:00
commit 560cfd48fc
3 changed files with 8 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
tests/generics/moverloading_typedesc.nim
View file

@ -5,7 +5,7 @@ type
FBar* = object
proc new*(_: typedesc[FFoo]): int = 2
#proc new*[T](_: typedesc[T]): int = 3
#proc new*(_: typedesc): int = 4
proc new*[T](_: typedesc[T]): int = 3
proc new*(_: typedesc): int = 4
proc new*(_: typedesc[seq[Table[int, seq[Table[int, string]]]]]): int = 5
proc new*(_: typedesc[seq[Table[int, seq[Table[int, typedesc]]]]]): int = 6

2
tests/generics/toverloading_typedesc.nim
View file

@ -10,7 +10,7 @@ type
when isMainModule:
# doAssert FBar.new() == 3
doAssert FBar.new() == 3
proc new(_: typedesc[LFoo]): int = 0
proc new[T](_: typedesc[T]): int = 1