coffee/etl
1
0
Fork 0
mirror of https://github.com/ETLCPP/etl.git synced 2026-10-28 18:07:10 +08:00
Code Issues Packages Projects Releases Wiki Activity

Changed conditional macros

Browse Source
This commit is contained in:
jwellbelove 2014-12-08 20:26:34 +00:00
parent 68816960b4
commit 952472da5b
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
nullptr.h
View File

@ -33,7 +33,7 @@ SOFTWARE.
/// A definition of nullptr for compilers that don't support it as standard.
///\ingroup utilities
#if defined(_MSC_VER) && (_MSC_VER < 1600)
#if (defined(_MSC_VER) && (_MSC_VER < 1600)) || defined(COMPILER_KEIL) || defined(COMPILER_IAR)
namespace std
{
//*****************************************************************************
@ -46,14 +46,14 @@ namespace std
// Convertible to any type of null non-member pointer.
template<class T>
inline operator T*() const
operator T*() const
{
return 0;
}
// Or any type of null member pointer.
template<class C, class T>
inline operator T C::*() const
operator T C::*() const
{
return 0;
}
@ -81,14 +81,14 @@ public:
// Convertible to any type of null non-member pointer.
template<class T>
inline operator T*() const
operator T*() const
{
return 0;
}
// Or any type of null member pointer.
template<class C, class T>
inline operator T C::*() const
operator T C::*() const
{
return 0;
}