diff options
| author | Antonin Kral <a.kral@bobek.cz> | 2012-05-10 06:57:57 +0200 |
|---|---|---|
| committer | Antonin Kral <a.kral@bobek.cz> | 2012-05-10 06:57:57 +0200 |
| commit | 8813daaab256108f7aa6300875e8562d031f2c2f (patch) | |
| tree | 06daade9022f76b2775d23f4613817365a2ded99 /util/allocator.h | |
| parent | d72a59184a3d51b17b30ed20fe656421bd4d2248 (diff) | |
| parent | 61619b3142c1de8f60f91964ff2656054d4f11a6 (diff) | |
| download | mongodb-8813daaab256108f7aa6300875e8562d031f2c2f.tar.gz | |
Merge tag 'upstream/2.0.5'
Upstream version 2.0.5
Diffstat (limited to 'util/allocator.h')
| -rw-r--r-- | util/allocator.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/util/allocator.h b/util/allocator.h index a642e7c..23ee4ee 100644 --- a/util/allocator.h +++ b/util/allocator.h @@ -32,8 +32,6 @@ namespace mongo { } #define MONGO_malloc mongo::ourmalloc -#define malloc MONGO_malloc #define MONGO_realloc mongo::ourrealloc -#define realloc MONGO_realloc } // namespace mongo |