Merge pull request #670 from ibuclaw/aaasync

Sync up AA declarations in object with rt.aaA
dlang · Nov 23, 2013 · 180bb86 · 180bb86
2 parents e8c760f + 7a28aef
commit 180bb86
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 9 deletions.
diff --git a/src/object.di b/src/object.di
@@ -352,13 +352,11 @@ class Error : Throwable
 
 extern (C)
 {
-    // from druntime/src/compiler/dmd/aaA.d
+    // from druntime/src/rt/aaA.d
 
     size_t _aaLen(in void* p) pure nothrow;
     void* _aaGetX(void** pp, const TypeInfo keyti, in size_t valuesize, in void* pkey);
     inout(void)* _aaGetRvalueX(inout void* p, in TypeInfo keyti, in size_t valuesize, in void* pkey);
-    inout(void)* _aaIn(inout void* p, in TypeInfo keyti);
-    void _aaDel(void* p, in TypeInfo keyti, ...);
     inout(void)[] _aaValues(inout void* p, in size_t keysize, in size_t valuesize) pure nothrow;
     inout(void)[] _aaKeys(inout void* p, in size_t keysize) pure nothrow;
     void* _aaRehash(void** pp, in TypeInfo keyti) pure nothrow;
@@ -375,8 +373,6 @@ extern (C)
     void* _aaRangeFrontKey(AARange r);
     void* _aaRangeFrontValue(AARange r);
     void _aaRangePopFront(ref AARange r);
-
-    void* _d_assocarrayliteralT(TypeInfo_AssociativeArray ti, in size_t length, ...);
 }
 
 private template _Unqual(T)

diff --git a/src/object_.d b/src/object_.d
@@ -1918,13 +1918,11 @@ extern (C) void rt_detachDisposeEvent(Object h, DEvent e)
 
 extern (C)
 {
-    // from druntime/src/compiler/dmd/aaA.d
+    // from druntime/src/rt/aaA.d
 
     size_t _aaLen(in void* p) pure nothrow;
     void* _aaGetX(void** pp, const TypeInfo keyti, in size_t valuesize, in void* pkey);
     inout(void)* _aaGetRvalueX(inout void* p, in TypeInfo keyti, in size_t valuesize, in void* pkey);
-    inout(void)* _aaIn(inout void* p, in TypeInfo keyti);
-    void _aaDel(void* p, in TypeInfo keyti, ...);
     inout(void)[] _aaValues(inout void* p, in size_t keysize, in size_t valuesize) pure nothrow;
     inout(void)[] _aaKeys(inout void* p, in size_t keysize) pure nothrow;
     void* _aaRehash(void** pp, in TypeInfo keyti) pure nothrow;
@@ -1942,7 +1940,6 @@ extern (C)
     void* _aaRangeFrontValue(AARange r);
     void _aaRangePopFront(ref AARange r);
 
-    void* _d_assocarrayliteralT(TypeInfo_AssociativeArray ti, in size_t length, ...);
     int _aaEqual(in TypeInfo tiRaw, in void* e1, in void* e2);
     hash_t _aaGetHash(in void* aa, in TypeInfo tiRaw) nothrow;
 }