swg-source-1.2/src-1.2
1
0
Fork 0
mirror of https://bitbucket.org/theswgsource/src-1.2.git synced 2026-07-31 01:15:48 -04:00
Code Issues Projects Releases Wiki Activity

newer standards prefer nullptr over NULL - this is most of them but there are others too

Browse Source
This commit is contained in:
DarthArgus
2016-02-15 00:07:31 -06:00
parent 6bb5137dc4
commit 03dc62efba
937 changed files with 14983 additions and 14983 deletions
Download Patch File Download Diff File Expand all files Collapse all files
external/3rd/library/platform/projects/MonAPI2/MonitorData.cpp
Vendored
+9 -9
View File
@@ -58,7 +58,7 @@ CMonitorData::CMonitorData()
{
m_sequence = 1;
m_buffer = NULL;
m_buffer = nullptr;
m_nbuffer = 0;
m_count = 0;
m_max = ELEMENT_MAX_START;
@@ -103,7 +103,7 @@ void CMonitorData::resize_buffer(int new_size)
{
char *temp;
if( m_buffer != NULL )
if( m_buffer != nullptr )
{
temp = m_buffer;
m_buffer = new char[ new_size];
@@ -331,7 +331,7 @@ char *p;
if( get_bit(mark,x) == 0 )
{
set_bit( mark, x );
if( m_data[x].discription != NULL )
if( m_data[x].discription != nullptr )
{
sprintf(tmp,"%d,%s|",m_data[x].id, m_data[x].discription);
size += (int)strlen(tmp);
@@ -360,7 +360,7 @@ char *p;
{
flag = 2;
set_bit(mark,x);
if( m_data[x].discription != NULL )
if( m_data[x].discription != nullptr )
{
sprintf(tmp,"%d,%s|",m_data[x].id, m_data[x].discription);
size += (int)strlen(tmp);
@@ -412,7 +412,7 @@ int x;
//******* Discription ******
delete [] m_data[x].discription;
m_data[x].discription = NULL;
m_data[x].discription = nullptr;
if( des )
{
m_data[x].discription = new char [strlen(des)+1];
@@ -459,10 +459,10 @@ int x;
{
if( Id == m_data[x].id )
{
if( Description == NULL )
if( Description == nullptr )
{
delete [] m_data[x].discription;
m_data[x].discription = NULL;
m_data[x].discription = nullptr;
mode = 0;
return x;
}
@@ -510,7 +510,7 @@ int high, i, low;
if ( high < m_count && Id==m_data[high].id )
{
if (m_data[high].ChangedTime == 0 || m_data[high].value != value) {
m_data[high].ChangedTime = (long)time(NULL);
m_data[high].ChangedTime = (long)time(nullptr);
m_data[high].value = value;
}
}
@@ -560,7 +560,7 @@ int CMonitorData::parseList( char **list, char *data, char tok , int max )
int count;
int cnt;
if( data == NULL )
if( data == nullptr )
return 0;
list[0] = data;