Merge branch 'master' of github.com:D-Programming-Language/druntime

dlang · Jul 19, 2011 · b7b51e2 · b7b51e2
2 parents fbffa21 + 85abbc9
commit b7b51e2
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 7 deletions.
diff --git a/src/core/exception.d b/src/core/exception.d
@@ -19,7 +19,7 @@ import core.stdc.stdio;
 
 private
 {
-    alias void function( string file, size_t line, string msg = null ) errorHandlerType;
+    alias void function( string file, size_t line, string msg ) errorHandlerType;
 
     // NOTE: One assert handler is used for all threads.  Thread-local
     //       behavior should occur within the handler itself.  This delegate
@@ -361,7 +361,7 @@ extern (C) void onAssertError( string file = __FILE__, size_t line = __LINE__ )
 {
     if( assertHandler is null )
         throw new AssertError( file, line );
-    assertHandler( file, line );
+    assertHandler( file, line, null);
 }
 
 

diff --git a/src/core/runtime.d b/src/core/runtime.d
@@ -21,7 +21,7 @@ private
 
     alias bool function() ModuleUnitTester;
     alias bool function(Object) CollectHandler;
-    alias Throwable.TraceInfo function( void* ptr = null ) TraceHandler;
+    alias Throwable.TraceInfo function( void* ptr ) TraceHandler;
 
     extern (C) void rt_setCollectHandler( CollectHandler h );
     extern (C) CollectHandler rt_getCollectHandler();

diff --git a/src/core/sys/windows/threadaux.d b/src/core/sys/windows/threadaux.d
@@ -193,7 +193,8 @@ private:
         }
 
         // execute function on the TLS for the given thread
-        static void impersonate_thread( uint id, void function() fn )
+        alias extern(C) void function() externCVoidFunc;
+        static void impersonate_thread( uint id, externCVoidFunc fn )
         {
             if( id == GetCurrentThreadId() )
             {

diff --git a/src/object_.d b/src/object_.d
@@ -1279,7 +1279,7 @@ class Throwable : Object
 }
 
 
-alias Throwable.TraceInfo function(void* ptr = null) TraceHandler;
+alias Throwable.TraceInfo function(void* ptr) TraceHandler;
 private __gshared TraceHandler traceHandler = null;
 
 

diff --git a/src/rt/adi.d b/src/rt/adi.d
@@ -315,7 +315,7 @@ extern (C) char[] _adSortChar(char[] a)
 {
     if (a.length > 1)
     {
-        dstring da = toUTF32(a);
+        dchar[] da = cast(dchar[])toUTF32(a);
         da.sort;
         size_t i = 0;
         foreach (dchar d; da)
@@ -337,7 +337,7 @@ extern (C) wchar[] _adSortWchar(wchar[] a)
 {
     if (a.length > 1)
     {
-        dstring da = toUTF32(a);
+        dchar[] da = cast(dchar[])toUTF32(a);
         da.sort;
         size_t i = 0;
         foreach (dchar d; da)
-Original file line number
+Diff line change
@@ Expand Up / @@ -1279,7 +1279,7 @@ class Throwable : Object @@
     }
-    alias Throwable.TraceInfo function(void* ptr = null) TraceHandler;
+    alias Throwable.TraceInfo function(void* ptr) TraceHandler;
     private __gshared TraceHandler traceHandler = null;
@@ Expand Down @@