Changed D 2.0 runtime to account for 'this' being changed from a pointer to a referen...

[software/druntime.git] / src / compiler / dmd / lifetime.d

diff --git a/src/compiler/dmd/lifetime.d b/src/compiler/dmd/lifetime.d
index e5ef60f6b903f380046f30a638501f4bb286796f..2b77809ad527606e48856431f91cc24992699e67 100644 (file)
--- a/src/compiler/dmd/lifetime.d
+++ b/src/compiler/dmd/lifetime.d
@@ -29,10 +29,10 @@ module rt.lifetime;
 
 private
 {
-    import stdc.stdlib;
-    import stdc.string;
-    import stdc.stdarg;
-    debug(PRINTF) import stdc.stdio;
+    import core.stdc.stdlib;
+    import core.stdc.string;
+    import core.stdc.stdarg;
+    debug(PRINTF) import core.stdc.stdio;
 }
 
 
@@ -66,7 +66,7 @@ private
     extern (C) size_t  gc_sizeOf( void* p );
     extern (C) BlkInfo gc_query( void* p );
 
-    extern (C) void onFinalizeError( ClassInfo c, Exception e );
+    extern (C) void onFinalizeError( ClassInfo c, Throwable e );
     extern (C) void onOutOfMemoryError();
 
     extern (C) void _d_monitordelete(Object h, bool det = true);
@@ -529,7 +529,7 @@ extern (C) void rt_finalize(void* p, bool det = true)
                 if ((cast(void**)p)[1]) // if monitor is not null
                     _d_monitordelete(cast(Object)p, det);
             }
-            catch (Exception e)
+            catch (Throwable e)
             {
                 onFinalizeError(**pc, e);
             }