summary refs log tree commit diff stats
path: root/lib/pure
diff options
context:
space:
mode:
authorAraq <rumpf_a@web.de>2013-09-03 23:46:41 +0200
committerAraq <rumpf_a@web.de>2013-09-03 23:46:41 +0200
commit40b379859c1f0775718a873a0ba58d32510855aa (patch)
tree5e45f929dba481fb2413d2f28587a1dbc65b2bb5 /lib/pure
parent891f871ba71b0b6e136fea13e5be0bd3e0860fea (diff)
parent6fa72c5d9d9662e6657ddf5c670dc56dc2748ecc (diff)
downloadNim-40b379859c1f0775718a873a0ba58d32510855aa.tar.gz
resolved the conflict
Diffstat (limited to 'lib/pure')
-rw-r--r--lib/pure/typetraits.nim2
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/pure/typetraits.nim b/lib/pure/typetraits.nim
index 45b79dcb6..e7bd363cf 100644
--- a/lib/pure/typetraits.nim
+++ b/lib/pure/typetraits.nim
@@ -13,3 +13,5 @@
 proc name*(t: typedesc): string {.magic: "TypeTrait".}
   ## Returns the name of the given type
 
+proc arity*(t: typedesc): int {.magic: "TypeTrait".}
+  ## Returns the arity of the given type
\ No newline at end of file