Skip to content
This repository was archived by the owner on Jan 23, 2023. It is now read-only.

Commit b560ecc

Browse files
Rename CompareAndSwap to InterlockedCompareExchange.
1 parent fc5385e commit b560ecc

File tree

4 files changed

+4
-4
lines changed

4 files changed

+4
-4
lines changed

src/gc/gchandletable.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ bool GCHandleManager::StoreObjectInHandleIfNull(OBJECTHANDLE handle, Object* obj
143143
return !!::HndFirstAssignHandle(handle, ObjectToOBJECTREF(object));
144144
}
145145

146-
Object* GCHandleManager::CompareAndSwapObjectInHandle(OBJECTHANDLE handle, Object* object, Object* comparandObject)
146+
Object* GCHandleManager::InterlockedCompareExchangeObjectInHandle(OBJECTHANDLE handle, Object* object, Object* comparandObject)
147147
{
148148
return (Object*)::HndInterlockedCompareExchangeHandle(handle, ObjectToOBJECTREF(object), ObjectToOBJECTREF(comparandObject));
149149
}

src/gc/gchandletableimpl.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ class GCHandleManager : public IGCHandleManager
5959

6060
virtual bool StoreObjectInHandleIfNull(OBJECTHANDLE handle, Object* object);
6161

62-
virtual Object* CompareAndSwapObjectInHandle(OBJECTHANDLE handle, Object* object, Object* comparandObject);
62+
virtual Object* InterlockedCompareExchangeObjectInHandle(OBJECTHANDLE handle, Object* object, Object* comparandObject);
6363
};
6464

6565
#endif // GCHANDLETABLE_H_

src/gc/gcinterface.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -449,7 +449,7 @@ class IGCHandleManager {
449449

450450
virtual bool StoreObjectInHandleIfNull(OBJECTHANDLE handle, Object* object) = 0;
451451

452-
virtual Object* CompareAndSwapObjectInHandle(OBJECTHANDLE handle, Object* object, Object* comparandObject) = 0;
452+
virtual Object* InterlockedCompareExchangeObjectInHandle(OBJECTHANDLE handle, Object* object, Object* comparandObject) = 0;
453453
};
454454

455455
// IGCHeap is the interface that the VM will use when interacting with the GC.

src/vm/gchandleutilities.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,7 @@ inline void* InterlockedCompareExchangeObjectInHandle(OBJECTHANDLE handle, OBJEC
193193
{
194194
ValidateHandleAssignment(handle, object);
195195

196-
return GCHandleUtilities::GetGCHandleManager()->CompareAndSwapObjectInHandle(handle, OBJECTREFToObject(object), OBJECTREFToObject(comparandObject));
196+
return GCHandleUtilities::GetGCHandleManager()->InterlockedCompareExchangeObjectInHandle(handle, OBJECTREFToObject(object), OBJECTREFToObject(comparandObject));
197197
}
198198

199199
inline void ResetOBJECTHANDLE(OBJECTHANDLE handle)

0 commit comments

Comments
 (0)