0
0
mirror of https://github.com/mongodb/mongo.git synced 2024-12-01 09:32:32 +01:00

Merge branch 'master' of git@github.com:mongodb/mongo

This commit is contained in:
Eliot Horowitz 2009-12-02 13:57:42 -05:00
commit e2e5b3abfe

View File

@ -19,7 +19,7 @@
#pragma once
#if defined(__MSCV__)
#if defined(_WIN32)
# include <windows.h>
#endif
@ -123,7 +123,7 @@ namespace mongo {
// returns original value (like x++)
WrappingInt atomicIncrement(){
#if defined(__MSCV__)
#if defined(_WIN32)
// InterlockedIncrement returns the new value
return InterlockedIncrement((volatile long*)&x)-1; //long is 32bits in Win64
#elif defined(__GCC_HAVE_SYNC_COMPARE_AND_SWAP_4)