diff options
| author | Jan Lindström <jan.lindstrom@skysql.com> | 2014-08-07 13:41:46 +0300 |
|---|---|---|
| committer | Jan Lindström <jan.lindstrom@skysql.com> | 2014-08-07 13:41:46 +0300 |
| commit | 50777e26f048bb2019cdb4439aebda7d530feba4 (patch) | |
| tree | 19d81d9ab5c5a47cb0981ac7225e95c8945cb783 | |
| parent | 6dad23f04aa5c8a022193cc74b62652a3c1e3057 (diff) | |
| download | mariadb-git-50777e26f048bb2019cdb4439aebda7d530feba4.tar.gz | |
Fix Windows compiler error by disabling for now the nullptr class
implementation.
| -rw-r--r-- | storage/innobase/btr/btr0defragment.cc | 10 | ||||
| -rw-r--r-- | storage/xtradb/btr/btr0defragment.cc | 9 |
2 files changed, 13 insertions, 6 deletions
diff --git a/storage/innobase/btr/btr0defragment.cc b/storage/innobase/btr/btr0defragment.cc index e315a291359..dfb2cd8dffd 100644 --- a/storage/innobase/btr/btr0defragment.cc +++ b/storage/innobase/btr/btr0defragment.cc @@ -43,6 +43,7 @@ Modified 30/07/2014 Jan Lindström jan.lindstrom@skysql.com Custom nullptr implementation for under g++ 4.6 *******************************************************/ // #pragma once +/* namespace std { // based on SC22/WG21/N2431 = J16/07-0301 @@ -70,11 +71,11 @@ private: void operator &() const; template<typename any> void operator +(any) const { - /*I Love MSVC 2005!*/ + // I Love MSVC 2005! } template<typename any> void operator -(any) const { - /*I Love MSVC 2005!*/ + // I Love MSVC 2005! } }; static const nullptr_t __nullptr = {}; @@ -83,6 +84,8 @@ static const nullptr_t __nullptr = {}; #ifndef nullptr #define nullptr std::__nullptr #endif +*/ + /**************************************************//** End of Custom nullptr implementation for under g++ 4.6 *******************************************************/ @@ -323,7 +326,8 @@ btr_defragment_item_t* btr_defragment_get_item() { if (btr_defragment_wq.empty()) { - return nullptr; + return NULL; + //return nullptr; } mutex_enter(&btr_defragment_mutex); list< btr_defragment_item_t* >::iterator iter = btr_defragment_wq.begin(); diff --git a/storage/xtradb/btr/btr0defragment.cc b/storage/xtradb/btr/btr0defragment.cc index a784c8c5be7..b4edda13b45 100644 --- a/storage/xtradb/btr/btr0defragment.cc +++ b/storage/xtradb/btr/btr0defragment.cc @@ -43,6 +43,7 @@ Modified 30/07/2014 Jan Lindström jan.lindstrom@skysql.com /**************************************************//** Custom nullptr implementation for under g++ 4.6 *******************************************************/ +/* // #pragma once namespace std { @@ -71,11 +72,11 @@ private: void operator &() const; template<typename any> void operator +(any) const { - /*I Love MSVC 2005!*/ + // I Love MSVC 2005! } template<typename any> void operator -(any) const { - /*I Love MSVC 2005!*/ + // I Love MSVC 2005! } }; static const nullptr_t __nullptr = {}; @@ -84,6 +85,7 @@ static const nullptr_t __nullptr = {}; #ifndef nullptr #define nullptr std::__nullptr #endif +*/ /**************************************************//** End of Custom nullptr implementation for under g++ 4.6 *******************************************************/ @@ -324,7 +326,8 @@ btr_defragment_item_t* btr_defragment_get_item() { if (btr_defragment_wq.empty()) { - return nullptr; + return NULL; + //return nullptr; } mutex_enter(&btr_defragment_mutex); list< btr_defragment_item_t* >::iterator iter = btr_defragment_wq.begin(); |