diff options
| author | Lv Meng <meng.lv@intel.com> | 2014-08-14 11:33:06 +0800 |
|---|---|---|
| committer | Yang Rong <rong.r.yang@intel.com> | 2014-08-19 14:05:42 +0800 |
| commit | b9334672bfeab9247ff92d0051d93b98b8e3da39 (patch) | |
| tree | ade373b5a14f4eae6be8d1b3bcfffbe1d18b921d /backend/src/sys | |
| parent | 506a19f6aee9103fe01ec9c0264b6f78004cfbe2 (diff) | |
Fix compile warnings for ICC compiler
1.the "const" associated functions' modification is to fix "type qualifier on return type is meaningless" for ICC compile warning.
2.the "operator new" shoud have the corresponding "operator delete" function.
3.In C++0x std::auto_ptr will be deprecated in favor of std::unique_ptr.
Signed-off-by: Lv Meng <meng.lv@intel.com>
Reviewed-by: "Song, Ruiling" <ruiling.song@intel.com>
Diffstat (limited to 'backend/src/sys')
| -rw-r--r-- | backend/src/sys/alloc.hpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/backend/src/sys/alloc.hpp b/backend/src/sys/alloc.hpp index 8fcb3a70..7ac91de5 100644 --- a/backend/src/sys/alloc.hpp +++ b/backend/src/sys/alloc.hpp @@ -73,13 +73,15 @@ public: \ void* operator new(size_t size) { \ return gbe::alignedMalloc(size, GBE_DEFAULT_ALIGNMENT); \ } \ + void operator delete(void* ptr) { return gbe::alignedFree(ptr); } \ void* operator new[](size_t size) { \ return gbe::alignedMalloc(size, GBE_DEFAULT_ALIGNMENT); \ } \ + void operator delete[](void* ptr) { return gbe::alignedFree(ptr); } \ void* operator new(size_t size, void *p) { return p; } \ + void operator delete(void* ptr, void *p) {/*do nothing*/} \ void* operator new[](size_t size, void *p) { return p; } \ - void operator delete(void* ptr) { return gbe::alignedFree(ptr); } \ - void operator delete[](void* ptr) { return gbe::alignedFree(ptr); } + void operator delete[](void* ptr, void *p) { /*do nothing*/ } /*! Macros to handle allocation position */ #define GBE_NEW(T,...) \ |
