Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Ignore:
Timestamp:
Nov 6, 2015, 10:54:34 PM (9 years ago)
Author:
landauf
Message:

replace '0' by 'nullptr'

Location:
code/branches/cpp11_v2/test/core/object
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • code/branches/cpp11_v2/test/core/object/StrongPtrTest.cc

    r10765 r10768  
    112112    {
    113113        EXPECT_TRUE(strongPtr == nullptr);
    114         EXPECT_TRUE(strongPtr == 0);
     114        EXPECT_TRUE(strongPtr == nullptr);
    115115        EXPECT_TRUE(!strongPtr);
    116116        EXPECT_FALSE(strongPtr != nullptr);
    117         EXPECT_FALSE(strongPtr != 0);
     117        EXPECT_FALSE(strongPtr != nullptr);
    118118        EXPECT_FALSE(strongPtr);
    119119    }
    … …  
    135135        }
    136136        {
    137             StrongPtr<DestroyableTest> strongPtr = 0;
     137            StrongPtr<DestroyableTest> strongPtr = nullptr;
    138138            isNull(strongPtr);
    139139        }
    140140        {
    141141            StrongPtr<DestroyableTest> strongPtr;
    142             strongPtr = 0;
     142            strongPtr = nullptr;
    143143            isNull(strongPtr);
    144144        }
    … …  
    151151        StrongPtr<DestroyableTest> strongPtr = test;
    152152        EXPECT_FALSE(strongPtr == nullptr);
    153         EXPECT_FALSE(strongPtr == 0);
     153        EXPECT_FALSE(strongPtr == nullptr);
    154154        EXPECT_FALSE(!strongPtr);
    155155        EXPECT_TRUE(strongPtr != nullptr);
    156         EXPECT_TRUE(strongPtr != 0);
     156        EXPECT_TRUE(strongPtr != nullptr);
    157157        EXPECT_TRUE(strongPtr);
    158158        test->destroy();

  • code/branches/cpp11_v2/test/core/object/WeakPtrTest.cc

    r10765 r10768  
    6767    {
    6868        EXPECT_TRUE(weakPtr == nullptr);
    69         EXPECT_TRUE(weakPtr == 0);
     69        EXPECT_TRUE(weakPtr == nullptr);
    7070        EXPECT_TRUE(!weakPtr);
    7171        EXPECT_FALSE(weakPtr != nullptr);
    72         EXPECT_FALSE(weakPtr != 0);
     72        EXPECT_FALSE(weakPtr != nullptr);
    7373        EXPECT_FALSE(weakPtr);
    7474    }
    … …  
    9090        }
    9191        {
    92             WeakPtr<DestroyableTest> weakPtr = 0;
     92            WeakPtr<DestroyableTest> weakPtr = nullptr;
    9393            isNull(weakPtr);
    9494        }
    9595        {
    9696            WeakPtr<DestroyableTest> weakPtr;
    97             weakPtr = 0;
     97            weakPtr = nullptr;
    9898            isNull(weakPtr);
    9999        }
    … …  
    105105        WeakPtr<DestroyableTest> weakPtr = test;
    106106        EXPECT_FALSE(weakPtr == nullptr);
    107         EXPECT_FALSE(weakPtr == 0);
     107        EXPECT_FALSE(weakPtr == nullptr);
    108108        EXPECT_FALSE(!weakPtr);
    109109        EXPECT_TRUE(weakPtr != nullptr);
    110         EXPECT_TRUE(weakPtr != 0);
     110        EXPECT_TRUE(weakPtr != nullptr);
    111111        EXPECT_TRUE(weakPtr);
    112112        test->destroy();
Note: See TracChangeset for help on using the changeset viewer.