From e32d033d7ecb0675f8337d97eb000bbeee5c296c Mon Sep 17 00:00:00 2001
From: Alexey Prokhin <alexey.prokhin@yandex.ru>
Date: Mon, 3 Jan 2011 16:50:08 +0300
Subject: [PATCH] Removed some old hacks

---
 druntime.patch | 13 ++----------
 ldc2.conf.in   |  3 +--
 phobos.patch   | 57 --------------------------------------------------
 3 files changed, 3 insertions(+), 70 deletions(-)

diff --git a/druntime.patch b/druntime.patch
index fbe426c7..0db6c427 100644
--- a/druntime.patch
+++ b/druntime.patch
@@ -4448,7 +4448,7 @@ diff -U 3 -H -d -r -N -x '*.mak' -x tk -x backend -x debug -x release -x '*_pch.
 +}
 diff -U 3 -H -d -r -N -x '*.mak' -x tk -x backend -x debug -x release -x '*_pch.h' -x Makefile -x '*.rej' -x '*~' -x '*.log' -x .svn -x '*pro.user' -x .directory -x cmake_install -x CMakeFiles -x .preprocessed.tmp -x 'Makefile.*' -x '*.orig' -- druntime-orig/import/object.di druntime/import/object.di
 --- druntime-orig/import/object.di	2010-10-13 10:37:58.000000000 +0400
-+++ druntime/import/object.di	2010-12-30 13:40:26.000000000 +0300
++++ druntime/import/object.di	2011-01-03 16:21:43.223688001 +0300
 @@ -142,7 +142,7 @@
      // 32:      // has typeinfo member
      void*       deallocator;
@@ -4458,15 +4458,6 @@ diff -U 3 -H -d -r -N -x '*.mak' -x tk -x backend -x debug -x release -x '*_pch.
      const(MemberInfo[]) function(string) xgetMembers;
  
      static TypeInfo_Class find(in char[] classname);
-@@ -189,7 +189,7 @@
- 
- class TypeInfo_Const : TypeInfo
- {
--    TypeInfo next;
-+    TypeInfo base;
- }
- 
- class TypeInfo_Invariant : TypeInfo_Const
 @@ -298,7 +298,6 @@
      interface TraceInfo
      {
@@ -4945,7 +4936,7 @@ diff -U 3 -H -d -r -N -x '*.mak' -x tk -x backend -x debug -x release -x '*_pch.
      }
 diff -U 3 -H -d -r -N -x '*.mak' -x tk -x backend -x debug -x release -x '*_pch.h' -x Makefile -x '*.rej' -x '*~' -x '*.log' -x .svn -x '*pro.user' -x .directory -x cmake_install -x CMakeFiles -x .preprocessed.tmp -x 'Makefile.*' -x '*.orig' -- druntime-orig/src/rt/aaA.d druntime/src/rt/aaA.d
 --- druntime-orig/src/rt/aaA.d	2010-08-05 05:39:06.000000000 +0400
-+++ druntime/src/rt/aaA.d	2010-11-05 11:43:19.000000000 +0300
++++ druntime/src/rt/aaA.d	2011-01-02 20:06:15.617075000 +0300
 @@ -204,7 +204,7 @@
   * Add entry for key if it is not already there.
   */
diff --git a/ldc2.conf.in b/ldc2.conf.in
index 445b06cd..2b0a4039 100644
--- a/ldc2.conf.in
+++ b/ldc2.conf.in
@@ -7,9 +7,8 @@ default:
     // 'switches' holds array of string that are appends to the command line
     // arguments before they are parsed.
     switches = [
-        "-I@RUNTIME_DIR@/src/compiler/ldc",
-        "-I@RUNTIME_DIR@/src/common",
         "-I@RUNTIME_DIR@/import",
+        "-I@RUNTIME_DIR@/src",
         "-L-L@PROJECT_BINARY_DIR@/../lib",
         "-defaultlib=@RUNTIME_AIO@",
         "-debuglib=@RUNTIME_AIO@"
diff --git a/phobos.patch b/phobos.patch
index 1f233101..9df920a2 100644
--- a/phobos.patch
+++ b/phobos.patch
@@ -37,63 +37,6 @@ diff -U 3 -H -d -r -N -x '*.mak' -x tk -x backend -x debug -x release -x '*_pch.
      char[20] buffer;
      int len = sprintf(buffer.ptr, "%g", d);
      return to!T(buffer[0 .. len].dup);
-diff -U 3 -H -d -r -N -x '*.mak' -x tk -x backend -x debug -x release -x '*_pch.h' -x Makefile -x '*.rej' -x '*~' -x '*.log' -x .svn -x '*pro.user' -x .directory -x cmake_install -x CMakeFiles -x .preprocessed.tmp -x 'Makefile.*' -x '*.orig' -- phobos-orig/std/format.d phobos/std/format.d
---- phobos-orig/std/format.d	2010-10-29 05:54:44.000000000 +0400
-+++ phobos/std/format.d	2010-11-07 19:26:52.000000000 +0300
-@@ -2582,20 +2582,42 @@
-         FLprecision = 0x80,
-     }
- 
--    static TypeInfo skipCI(TypeInfo valti)
-+    version(LDC)
-     {
--        for (;;)
-+        static TypeInfo skipCI(TypeInfo valti)
-         {
--            if (valti.classinfo.name.length == 18 &&
--                    valti.classinfo.name[9..18] == "Invariant")
--                valti =        (cast(TypeInfo_Invariant)valti).next;
--            else if (valti.classinfo.name.length == 14 &&
--                    valti.classinfo.name[9..14] == "Const")
--                valti =        (cast(TypeInfo_Const)valti).next;
--            else
--                break;
-+            for (;;)
-+            {
-+                if (valti.classinfo.name.length == 18 &&
-+                        valti.classinfo.name[9..18] == "Invariant")
-+                    valti =        (cast(TypeInfo_Invariant)valti).base;
-+                else if (valti.classinfo.name.length == 14 &&
-+                        valti.classinfo.name[9..14] == "Const")
-+                    valti =        (cast(TypeInfo_Const)valti).base;
-+                else
-+                    break;
-+            }
-+            return valti;
-+        }
-+
-+    } 
-+    else
-+    {
-+        static TypeInfo skipCI(TypeInfo valti)
-+        {
-+            for (;;)
-+            {
-+                if (valti.classinfo.name.length == 18 &&
-+                        valti.classinfo.name[9..18] == "Invariant")
-+                    valti =        (cast(TypeInfo_Invariant)valti).next;
-+                else if (valti.classinfo.name.length == 14 &&
-+                        valti.classinfo.name[9..14] == "Const")
-+                    valti =        (cast(TypeInfo_Const)valti).next;
-+                else
-+                    break;
-+            }
-+            return valti;
-         }
--        return valti;
-     }
- 
-     void formatArg(char fc)
 diff -U 3 -H -d -r -N -x '*.mak' -x tk -x backend -x debug -x release -x '*_pch.h' -x Makefile -x '*.rej' -x '*~' -x '*.log' -x .svn -x '*pro.user' -x .directory -x cmake_install -x CMakeFiles -x .preprocessed.tmp -x 'Makefile.*' -x '*.orig' -- phobos-orig/std/functional.d phobos/std/functional.d
 --- phobos-orig/std/functional.d	2010-10-29 05:54:44.000000000 +0400
 +++ phobos/std/functional.d	2010-12-30 13:56:03.206104002 +0300