Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixing NULLs to nullptrs (cpp files). #3557

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fixing NULLs to nullptrs (cpp files). #3557

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
51c665c
Fix to prefer nullptr over NULL
shahzadlone Jan 16, 2019
64804cc
Fix more NULLS
shahzadlone Jan 16, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Source/CNTK/CNTK.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ void RedirectStdErr(wstring logpath, bool appendLogFile = false)
{
RuntimeError("unexpected failure to redirect stderr to log file");
}
setvbuf(stderr, NULL, _IONBF, 16384); // unbuffer it
setvbuf(stderr, nullptr, _IONBF, 16384); // unbuffer it
static auto fKept = f; // keep it around (until it gets changed)
}

Expand Down Expand Up @@ -357,7 +357,7 @@ void DoCommands(const ConfigParameters& config, const shared_ptr<MPIWrapper>& mp

std::string TimeDateStamp()
{
time_t t = time(NULL);
time_t t = time(nullptr);
struct tm now = *localtime(&t);
char buf[30];
sprintf(buf, "%04d/%02d/%02d %02d:%02d:%02d", now.tm_year + 1900, now.tm_mon + 1, now.tm_mday, now.tm_hour, now.tm_min, now.tm_sec);
Expand Down
11 changes: 6 additions & 5 deletions Source/CNTK/ModelEditLanguage.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ namespace Microsoft { namespace MSR { namespace CNTK {
// string2 - second string to compare
// alternate - alternate naming of the string
// return - true if strings are equal insensitive and modifies string1 to sensitive version if different
bool EqualInsensitive(std::string& string1, const char* string2, const char* alternate /*=NULL*/)
bool EqualInsensitive(std::string& string1, const char* string2, const char* alternate /*=nullptr*/)
{
bool equal = !_strnicmp(string1.c_str(), string2, string1.size());

Expand All @@ -32,7 +32,7 @@ bool EqualInsensitive(std::string& string1, const char* string2, const char* alt
if (equal && strcmp(string1.c_str(), string2))
string1 = string2;

if (!equal && alternate != NULL)
if (!equal && alternate != nullptr)
{
equal = !_strnicmp(string1.c_str(), alternate, string1.size());

Expand All @@ -51,7 +51,8 @@ bool EqualInsensitive(std::string& string1, const char* string2, const char* alt
// MELProperty - the properties for SetProperty
enum MELProperty
{
melPropNull,
melProp
,
melPropParameterUpdateRequired,
melPropLearningRateMultiplier,
melPropFeature,
Expand Down Expand Up @@ -188,7 +189,7 @@ void MELScript<ElemType>::CallFunction(const std::string& p_name, const ConfigPa
std::wstring fileName = params[0];

auto cn = m_netNdlDefault->cn;
if (cn == NULL)
if (cn == nullptr)
RuntimeError("SaveDefaultModel can only be called after a default name exists (i.e., at least one model is loaded.)");

// validate the network before we save it out
Expand All @@ -207,7 +208,7 @@ void MELScript<ElemType>::CallFunction(const std::string& p_name, const ConfigPa
std::wstring fileName = params[1];

NetNdl<ElemType>* netNdl = &m_mapNameToNetNdl[modelName];
if (netNdl->cn == NULL)
if (netNdl->cn == nullptr)
RuntimeError("SaveModel can only be called after a network has been setup, no active model named %s.", modelName.c_str());

// validate and finish the second pass through NDL if any in-line NDL was defined
Expand Down