Merge pull request #1129 from D-Programming-Language/revert-1128-dip25

Revert "DIP25: implement in druntime"
dlang · Jan 26, 2015 · 0d73cf2 · 0d73cf2
2 parents c1ec446 + e1f0dce
commit 0d73cf2
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 15 deletions.
diff --git a/posix.mak b/posix.mak
@@ -64,8 +64,8 @@ else
 	DOTLIB:=.a
 endif
 
-DFLAGS=$(MODEL_FLAG) -O -release -dip25 -inline -w -Isrc -Iimport $(PIC)
-UDFLAGS=$(MODEL_FLAG) -O -release -dip25 -w -Isrc -Iimport $(PIC)
+DFLAGS=$(MODEL_FLAG) -O -release -inline -w -Isrc -Iimport $(PIC)
+UDFLAGS=$(MODEL_FLAG) -O -release -w -Isrc -Iimport $(PIC)
 DDOCFLAGS=-c -w -o- -Isrc -Iimport -version=CoreDdoc
 
 CFLAGS=$(MODEL_FLAG) -O $(PIC)

diff --git a/src/core/runtime.d b/src/core/runtime.d
@@ -538,7 +538,7 @@ Throwable.TraceInfo defaultTraceHandler( void* ptr = null )
             void*[MAXFRAMES]  callstack = void;
 
         private:
-            const(char)[] fixline( const(char)[] buf, return ref char[4096] fixbuf ) const
+            const(char)[] fixline( const(char)[] buf, ref char[4096] fixbuf ) const
             {
                 size_t symBeg, symEnd;
                 version( OSX )

diff --git a/src/core/sys/posix/signal.d b/src/core/sys/posix/signal.d
@@ -664,12 +664,12 @@ version( linux )
         } _sifields_t _sifields;
 
     nothrow @nogc:
-        @property ref pid_t si_pid() return { return _sifields._kill.si_pid; }
-        @property ref uid_t si_uid() return { return _sifields._kill.si_uid; }
-        @property ref void* si_addr() return { return _sifields._sigfault.si_addr; }
-        @property ref int si_status() return { return _sifields._sigchld.si_status; }
-        @property ref c_long si_band() return { return _sifields._sigpoll.si_band; }
-        @property ref sigval si_value() return { return _sifields._rt.si_sigval; }
+        @property ref pid_t si_pid() { return _sifields._kill.si_pid; }
+        @property ref uid_t si_uid() { return _sifields._kill.si_uid; }
+        @property ref void* si_addr() { return _sifields._sigfault.si_addr; }
+        @property ref int si_status() { return _sifields._sigchld.si_status; }
+        @property ref c_long si_band() { return _sifields._sigpoll.si_band; }
+        @property ref sigval si_value() { return _sifields._rt.si_sigval; }
     }
 
     enum

diff --git a/src/rt/util/utf.d b/src/rt/util/utf.d
@@ -577,7 +577,7 @@ void validate(S)(in S s)
 
 /* =================== Conversion to UTF8 ======================= */
 
-char[] toUTF8(return out char[4] buf, dchar c)
+char[] toUTF8(out char[4] buf, dchar c)
     in
     {
         assert(isValidDchar(c));
@@ -682,7 +682,7 @@ string toUTF8(in dchar[] s)
 
 /* =================== Conversion to UTF16 ======================= */
 
-wchar[] toUTF16(return out wchar[2] buf, dchar c)
+wchar[] toUTF16(out wchar[2] buf, dchar c)
     in
     {
         assert(isValidDchar(c));

diff --git a/win32.mak b/win32.mak
@@ -9,8 +9,8 @@ CC=dmc
 DOCDIR=doc
 IMPDIR=import
 
-DFLAGS=-m$(MODEL) -O -release -dip25 -inline -w -Isrc -Iimport
-UDFLAGS=-m$(MODEL) -O -release -dip25 -w -Isrc -Iimport
+DFLAGS=-m$(MODEL) -O -release -inline -w -Isrc -Iimport
+UDFLAGS=-m$(MODEL) -O -release -w -Isrc -Iimport
 DDOCFLAGS=-c -w -o- -Isrc -Iimport -version=CoreDdoc
 
 CFLAGS=

diff --git a/win64.mak b/win64.mak
@@ -15,8 +15,8 @@ CP=cp
 DOCDIR=doc
 IMPDIR=import
 
-DFLAGS=-m$(MODEL) -O -release -dip25 -inline -w -Isrc -Iimport
-UDFLAGS=-m$(MODEL) -O -release -dip25 -w -Isrc -Iimport
+DFLAGS=-m$(MODEL) -O -release -inline -w -Isrc -Iimport
+UDFLAGS=-m$(MODEL) -O -release -w -Isrc -Iimport
 DDOCFLAGS=-c -w -o- -Isrc -Iimport -version=CoreDdoc
 
 #CFLAGS=/O2 /I"$(VCDIR)"\INCLUDE /I"$(SDKDIR)"\Include