Ignore:
Timestamp:
Feb 26, 2013, 2:43:45 PM (7 years ago)
Author:
sam
Message:

base: start removing occurrences of NULL on our long journey to nullptr.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/easymesh/easymesh.cpp

    r2480 r2506  
    8686        if (m_shader_uniform[i].m1 == uniform)
    8787            return &m_shader_uniform[i].m2;
    88     return NULL;
     88    return nullptr;
    8989}
    9090
     
    9595        if (m_shader_attrib[i].m1 == attribute)
    9696            return &m_shader_attrib[i].m2;
    97     return NULL;
     97    return nullptr;
    9898}
    9999
     
    182182    m_vertexcount = 0;
    183183    m_indexcount = 0;
    184     m_ibo = NULL;
     184    m_ibo = nullptr;
    185185}
    186186
     
    221221        m_gpudatas.Reserve(DebugRenderMode::Max);
    222222        for (int i = 0; i < DebugRenderMode::Max; i++)
    223             m_gpudatas << NULL;
     223            m_gpudatas << nullptr;
    224224    }
    225225    m_gpudatas[gpudata->m_render_mode] = gpudata;
     
    233233            return;
    234234
    235     VertexDeclaration* new_vdecl = NULL;
    236     VertexBuffer* new_vbo = NULL;
    237     void *vbo_data = NULL;
     235    VertexDeclaration* new_vdecl = nullptr;
     236    VertexBuffer* new_vbo = nullptr;
     237    void *vbo_data = nullptr;
    238238    int vbo_bytes = 0;
    239239
     
    365365//-----------------------------------------------------------------------------
    366366EasyMesh::EasyMesh()
    367   : m_build_data(NULL)
     367  : m_build_data(nullptr)
    368368{
    369369    m_cursors.Push(0, 0);
     
    392392{
    393393    delete(m_build_data);
    394     m_build_data = NULL;
     394    m_build_data = nullptr;
    395395
    396396    if (new_gpu_sdata)
     
    22512251
    22522252//-----------------------------------------------------------------------------
    2253 void EasyMesh::SplitTriangles(int pass) { SplitTriangles(pass, NULL); }
     2253void EasyMesh::SplitTriangles(int pass) { SplitTriangles(pass, nullptr); }
    22542254
    22552255//-----------------------------------------------------------------------------
Note: See TracChangeset for help on using the changeset viewer.