summary refs log tree commit diff stats
path: root/lib
diff options
context:
space:
mode:
authorAraq <rumpf_a@web.de>2012-08-24 19:08:34 +0200
committerAraq <rumpf_a@web.de>2012-08-24 19:08:34 +0200
commit8a92e95ccfb2653d8cea52a83c26ac8967557062 (patch)
treefc7fb79f860dd1d9c32fffb3afcf100454afa0c5 /lib
parentd17caa86e841489d92165d9caa13c2d8bc86afd5 (diff)
downloadNim-8a92e95ccfb2653d8cea52a83c26ac8967557062.tar.gz
made tests green again
Diffstat (limited to 'lib')
-rwxr-xr-xlib/pure/marshal.nim2
-rwxr-xr-xlib/system/threads.nim2
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/pure/marshal.nim b/lib/pure/marshal.nim
index e8c30331a..bffc4ebb6 100755
--- a/lib/pure/marshal.nim
+++ b/lib/pure/marshal.nim
@@ -306,7 +306,7 @@ when isMainModule:
   testit(test7)

 

   type 

-    TA = object

+    TA {.inheritable.} = object

     TB = object of TA

       f: int

 

diff --git a/lib/system/threads.nim b/lib/system/threads.nim
index 87411c935..81e0cb00a 100755
--- a/lib/system/threads.nim
+++ b/lib/system/threads.nim
@@ -165,7 +165,7 @@ type
   TThreadLocalStorage = array [0..1_000, float]
 
   PGcThread = ptr TGcThread
-  TGcThread {.pure.} = object
+  TGcThread {.pure, inheritable.} = object
     sys: TSysThread
     when emulatedThreadVars and not useStackMaskHack:
       tls: TThreadLocalStorage