blob: 53b1dd0d045c83812b79497ad2f07d9574ea4543 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
|
--- src/common/classes/alloc.h
+++ src/common/classes/alloc.h
@@ -489,23 +489,7 @@
inline static MemoryPool* getDefaultMemoryPool() { return Firebird::MemoryPool::processMemoryPool; }
// Global versions of operators new and delete
-inline void* operator new(size_t s) THROW_BAD_ALLOC
-{
- return Firebird::MemoryPool::globalAlloc(s);
-}
-inline void* operator new[](size_t s) THROW_BAD_ALLOC
-{
- return Firebird::MemoryPool::globalAlloc(s);
-}
-inline void operator delete(void* mem) throw()
-{
- Firebird::MemoryPool::globalFree(mem);
-}
-inline void operator delete[](void* mem) throw()
-{
- Firebird::MemoryPool::globalFree(mem);
-}
#ifdef DEBUG_GDS_ALLOC
inline void* operator new(size_t s, Firebird::MemoryPool& pool, const char* file, int line)
--- src/common/classes/alloc.cpp
+++ src/common/classes/alloc.cpp
@@ -2080,3 +2080,21 @@
#endif
} // namespace Firebird
+
+void* operator new(size_t s) THROW_BAD_ALLOC
+{
+ return Firebird::MemoryPool::globalAlloc(s);
+}
+void* operator new[](size_t s) THROW_BAD_ALLOC
+{
+ return Firebird::MemoryPool::globalAlloc(s);
+}
+
+void operator delete(void* mem) throw()
+{
+ Firebird::MemoryPool::globalFree(mem);
+}
+void operator delete[](void* mem) throw()
+{
+ Firebird::MemoryPool::globalFree(mem);
+}
|
