Merge remote-tracking branch 'upstream/stable'

# Conflicts: # changelog.dd # mak/COPY # mak/MANIFEST # win32.mak # win64.mak
dlang · Feb 28, 2016 · 264731c · 264731c
2 parents 4fb9f6c + bf92678
commit 264731c
Show file tree

Hide file tree

Showing 129 changed files with 10,043 additions and 9,894 deletions.
diff --git a/.gitignore b/.gitignore
@@ -8,5 +8,6 @@ druntime.json
 trace.def
 trace.log
 Makefile
-/errno_c.obj
+/errno_c*.obj
+/msvc*.obj
 make
diff --git a/changelog.dd b/changelog.dd
@@ -1,34 +1,16 @@
 Ddoc
 
-$(COMMENT Pending changelog for 2.067.0.
+$(COMMENT Pending changelog for 2.071.0.
 )
 
 $(BUGSTITLE Library Changes,
 
-$(LI $(RELATIVE_LINK2 TypeInfo.initializer, `TypeInfo.init` has been renamed to
-    `TypeInfo.initializer`.))
 $(LI $(RELATIVE_LINK2 aa-clear, A `clear` method has been added to associative
     arrays to remove all elements.))
 )
 
 $(BUGSTITLE Library Changes,
 
-$(LI $(LNAME2 TypeInfo.initializer, `TypeInfo.init` has been renamed to
-    `TypeInfo.initializer`.)
-
-    $(P The method `TypeInfo.init` has been renamed to
-        $(A ../phobos-prerelease/object.html#.TypeInfo.initializer,
-        `TypeInfo.initializer`).
-        This is necessary because the method clashes with the
-        $(A ../property.html#init, type property of the same name).
-    )
-    $(P An alias with the old name has been added, and it's supposed to stay
-        around through version 2.071.0. It's scheduled to be deprecated with the
-        2.072.0 release, and is going to be `@disable`d with the 2.073.0
-        release. Finally, the special casing is going to be removed with the
-        2.074.0 release, so that the type property `init` takes over.
-    )
-)
 $(LI $(LNAME2 aa-clear, A `clear` method has been added to associative
     arrays to remove all elements.)
 

diff --git a/mak/COPY b/mak/COPY
@@ -46,8 +46,6 @@ COPY=\
 	$(IMPDIR)\core\stdcpp\typeinfo.d \
 	$(IMPDIR)\core\stdcpp\exception.d \
 	\
-	$(IMPDIR)\core\sys\unwind.d \
-	\
 	$(IMPDIR)\core\sys\freebsd\dlfcn.d \
 	$(IMPDIR)\core\sys\freebsd\execinfo.d \
 	\

diff --git a/mak/SRCS b/mak/SRCS
@@ -45,8 +45,6 @@ SRCS=\
 	src\core\sync\rwmutex.d \
 	src\core\sync\semaphore.d \
 	\
-	src\core\sys\unwind.d \
-	\
 	src\core\sys\freebsd\execinfo.d \
 	src\core\sys\freebsd\sys\event.d \
 	\
@@ -289,6 +287,7 @@ SRCS=\
 	src\rt\tlsgc.d \
 	src\rt\trace.d \
 	src\rt\tracegc.d \
+	src\rt\unwind.d \
 	\
 	src\rt\backtrace\dwarf.d \
 	src\rt\backtrace\elf.d \

diff --git a/src/core/cpuid.d b/src/core/cpuid.d
@@ -179,7 +179,7 @@ public:
     /// Is AMD 3DNOW Ext supported?
     bool amd3dnowExt()  {return _amd3dnowExt;}
     /// Are AMD extensions to MMX supported?
-    bool amdMmx()       {return amdMmx;}
+    bool amdMmx()       {return _amdMmx;}
     /// Is fxsave/fxrstor supported?
     bool hasFxsr()          {return _hasFxsr;}
     /// Is cmov supported?

diff --git a/src/core/sys/windows/accctrl.d b/src/core/sys/windows/accctrl.d
@@ -10,14 +10,16 @@
 module core.sys.windows.accctrl;
 version (Windows):
 
+version (ANSI) {} else version = Unicode;
+
 private import core.sys.windows.basetyps, core.sys.windows.w32api, core.sys.windows.winbase, core.sys.windows.windef;
 
 // FIXME: check types and grouping of constants
 // FIXME: check Windows version support
 
 alias LocalFree AccFree;
 
-const uint
+enum uint
     ACTRL_RESERVED            = 0x00000000,
     ACTRL_ACCESS_PROTECTED    = 0x00000001,
     ACTRL_ACCESS_ALLOWED      = 0x00000001,
@@ -32,7 +34,7 @@ const uint
     ACTRL_SYNCHRONIZE         = 0x80000000,
     ACTRL_STD_RIGHTS_ALL      = 0xf8000000;
 
-const uint
+enum uint
     ACTRL_FILE_READ           = 0x00000001,
     ACTRL_FILE_WRITE          = 0x00000002,
     ACTRL_FILE_APPEND         = 0x00000004,
@@ -43,14 +45,14 @@ const uint
     ACTRL_FILE_WRITE_ATTRIB   = 0x00000100,
     ACTRL_FILE_CREATE_PIPE    = 0x00000200;
 
-const uint
+enum uint
     ACTRL_DIR_LIST            = 0x00000001,
     ACTRL_DIR_CREATE_OBJECT   = 0x00000002,
     ACTRL_DIR_CREATE_CHILD    = 0x00000004,
     ACTRL_DIR_DELETE_CHILD    = 0x00000040,
     ACTRL_DIR_TRAVERSE        = 0x00000020;
 
-const uint
+enum uint
     ACTRL_KERNEL_TERMINATE    = 0x00000001,
     ACTRL_KERNEL_THREAD       = 0x00000002,
     ACTRL_KERNEL_VM           = 0x00000004,
@@ -68,14 +70,14 @@ const uint
     ACTRL_KERNEL_IMPERSONATE  = 0x00004000,
     ACTRL_KERNEL_DIMPERSONATE = 0x00008000;
 
-const uint
+enum uint
     ACTRL_PRINT_SADMIN        = 0x00000001,
     ACTRL_PRINT_SLIST         = 0x00000002,
     ACTRL_PRINT_PADMIN        = 0x00000004,
     ACTRL_PRINT_PUSE          = 0x00000008,
     ACTRL_PRINT_JADMIN        = 0x00000010;
 
-const uint
+enum uint
     ACTRL_SVC_GET_INFO        = 0x00000001,
     ACTRL_SVC_SET_INFO        = 0x00000002,
     ACTRL_SVC_STATUS          = 0x00000004,
@@ -86,15 +88,15 @@ const uint
     ACTRL_SVC_INTERROGATE     = 0x00000080,
     ACTRL_SVC_UCONTROL        = 0x00000100;
 
-const uint
+enum uint
     ACTRL_REG_QUERY           = 0x00000001,
     ACTRL_REG_SET             = 0x00000002,
     ACTRL_REG_CREATE_CHILD    = 0x00000004,
     ACTRL_REG_LIST            = 0x00000008,
     ACTRL_REG_NOTIFY          = 0x00000010,
     ACTRL_REG_LINK            = 0x00000020;
 
-const uint
+enum uint
     ACTRL_WIN_CLIPBRD         = 0x00000001,
     ACTRL_WIN_GLOBAL_ATOMS    = 0x00000002,
     ACTRL_WIN_CREATE          = 0x00000004,
@@ -112,15 +114,15 @@ enum : uint {
 
 const TCHAR[] ACCCTRL_DEFAULT_PROVIDER = "Windows NT Access Provider";
 
-const uint
+enum uint
     TRUSTEE_ACCESS_ALLOWED    = 0x00000001,
     TRUSTEE_ACCESS_READ       = 0x00000002,
     TRUSTEE_ACCESS_WRITE      = 0x00000004,
     TRUSTEE_ACCESS_EXPLICIT   = 0x00000001,
     TRUSTEE_ACCESS_READ_WRITE = 0x00000006,
     TRUSTEE_ACCESS_ALL        = 0xFFFFFFFF;
 
-const uint
+enum uint
     NO_INHERITANCE                     = 0x0,
     SUB_OBJECTS_ONLY_INHERIT           = 0x1,
     SUB_CONTAINERS_ONLY_INHERIT        = 0x2,

diff --git a/src/core/sys/windows/aclapi.d b/src/core/sys/windows/aclapi.d
@@ -9,6 +9,8 @@
  */
 module core.sys.windows.aclapi;
 version (Windows):
+
+version (ANSI) {} else version = Unicode;
 pragma(lib, "advapi32");
 
 import core.sys.windows.windows, core.sys.windows.accctrl;

diff --git a/src/core/sys/windows/aclui.d b/src/core/sys/windows/aclui.d
@@ -33,7 +33,7 @@ struct SI_OBJECT_INFO {
 alias SI_OBJECT_INFO* PSI_OBJECT_INFO;
 
 // values for SI_OBJECT_INFO.dwFlags
-const DWORD
+enum DWORD
     SI_EDIT_PERMS               = 0x00000000,
     SI_EDIT_OWNER               = 0x00000001,
     SI_EDIT_AUDITS              = 0x00000002,
@@ -61,23 +61,23 @@ const DWORD
                                   | SI_EDIT_AUDITS;
 
 struct SI_ACCESS {
-    const(GUID)* pguid;
+const(GUID)* pguid;
     ACCESS_MASK  mask;
     LPCWSTR      pszName;
     DWORD        dwFlags;
 }
 alias SI_ACCESS* PSI_ACCESS;
 
 // values for SI_ACCESS.dwFlags
-const DWORD
+enum DWORD
     SI_ACCESS_SPECIFIC  = 0x00010000,
     SI_ACCESS_GENERAL   = 0x00020000,
     SI_ACCESS_CONTAINER = 0x00040000,
     SI_ACCESS_PROPERTY  = 0x00080000;
 
 
 struct SI_INHERIT_TYPE {
-    const(GUID)* pguid;
+const(GUID)* pguid;
     ULONG        dwFlags;
     LPCWSTR      pszName;
 }
@@ -94,7 +94,7 @@ enum SI_PAGE_TYPE {
     SI_PAGE_OWNER
 }
 
-const uint PSPCB_SI_INITDIALOG = WM_USER + 1;
+enum uint PSPCB_SI_INITDIALOG = WM_USER + 1;
 
 interface ISecurityInformation : IUnknown {
     HRESULT GetObjectInformation(PSI_OBJECT_INFO);

diff --git a/src/core/sys/windows/basetsd.d b/src/core/sys/windows/basetsd.d
@@ -40,7 +40,7 @@ template TypeDef(T) {
 
 alias TypeDef!(void*) HANDLE;
 /+struct HANDLE {
-    const(void)* h;
+const(void)* h;
     alias h this;
 }+/
 
@@ -51,7 +51,7 @@ alias HANDLE* PHANDLE, LPHANDLE;
 
 version (Win64) {
     alias long __int3264;
-    const ulong ADDRESS_TAG_BIT = 0x40000000000;
+enum ulong ADDRESS_TAG_BIT = 0x40000000000;
 
     alias long INT_PTR, LONG_PTR;
     alias long* PINT_PTR, PLONG_PTR;
@@ -79,7 +79,7 @@ version (Win64) {
 
 } else {
     alias int __int3264;
-    const uint ADDRESS_TAG_BIT = 0x80000000;
+enum uint ADDRESS_TAG_BIT = 0x80000000;
 
     alias int INT_PTR, LONG_PTR;
     alias int* PINT_PTR, PLONG_PTR;