From 8a92e95ccfb2653d8cea52a83c26ac8967557062 Mon Sep 17 00:00:00 2001
From: Araq <rumpf_a@web.de>
Date: Fri, 24 Aug 2012 19:08:34 +0200
Subject: [PATCH] made tests green again

---
 lib/pure/marshal.nim      | 2 +-
 lib/system/threads.nim    | 2 +-
 tests/reject/tenummix.nim | 2 +-
 tests/run/mmultim3.nim    | 2 +-
 tests/run/tmultim1.nim    | 2 +-
 tests/run/tmultim2.nim    | 2 +-
 tests/run/tofopr.nim      | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/lib/pure/marshal.nim b/lib/pure/marshal.nim
index e8c30331a0..bffc4ebb6c 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 87411c9355..81e0cb00a9 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
diff --git a/tests/reject/tenummix.nim b/tests/reject/tenummix.nim
index 55c0c05a95..53be02ffaf 100644
--- a/tests/reject/tenummix.nim
+++ b/tests/reject/tenummix.nim
@@ -1,6 +1,6 @@
 discard """
   file: "system.nim"
-  line: 643
+  line: 646
   errormsg: "type mismatch"
 """
 
diff --git a/tests/run/mmultim3.nim b/tests/run/mmultim3.nim
index ca73ebea62..3139a80899 100755
--- a/tests/run/mmultim3.nim
+++ b/tests/run/mmultim3.nim
@@ -1,5 +1,5 @@
 type
-    TObj* = object
+    TObj* = object {.inheritable.}
 
 var myObj* : ref TObj
 
diff --git a/tests/run/tmultim1.nim b/tests/run/tmultim1.nim
index 4fcf81c987..7f551aa649 100755
--- a/tests/run/tmultim1.nim
+++ b/tests/run/tmultim1.nim
@@ -5,7 +5,7 @@ discard """
 # Test multi methods
 
 type
-  Expression = ref object
+  Expression = ref object {.inheritable.}
   Literal = ref object of Expression
     x: int
   PlusExpr = ref object of Expression
diff --git a/tests/run/tmultim2.nim b/tests/run/tmultim2.nim
index 956b226470..75f6521371 100755
--- a/tests/run/tmultim2.nim
+++ b/tests/run/tmultim2.nim
@@ -5,7 +5,7 @@ discard """
 # Test multi methods
 
 type
-  TThing = object
+  TThing = object {.inheritable.}
   TUnit = object of TThing
     x: int
   TParticle = object of TThing
diff --git a/tests/run/tofopr.nim b/tests/run/tofopr.nim
index f9c21ad169..961d81bd32 100755
--- a/tests/run/tofopr.nim
+++ b/tests/run/tofopr.nim
@@ -5,7 +5,7 @@ discard """
 # Test is operator
 
 type
-  TMyType = object
+  TMyType = object {.inheritable.}
     len: int
     data: string