Skip to content

Commit

Permalink
Changed 'uninitialised' to 'uninitialized' to be consistent with prev…
Browse files Browse the repository at this point in the history
…ious naming scheme
  • Loading branch information
mpflanzer committed Jun 22, 2015
1 parent d716096 commit 5978c88
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion src/core/common.h
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ namespace oclgrind
WARNING = 2,
ERROR = 3,
// Special warning types
WARNING_UNINITIALISED = WARNING + 4,
WARNING_UNINITIALIZED = WARNING + 4,
// Special error types
ERROR_DIVERGENCE = ERROR + 4,
ERROR_INVALID_ACCESS = ERROR + 8,
Expand Down
6 changes: 3 additions & 3 deletions src/plugins/Logger.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ void Logger::enableAllDiagnostics()
enableDiagnosticOption(WARNING);
enableDiagnosticOption(ERROR);
// Turn on specific groups
enableDiagnosticOption(WARNING_UNINITIALISED);
enableDiagnosticOption(WARNING_UNINITIALIZED);
enableDiagnosticOption(ERROR_DIVERGENCE);
enableDiagnosticOption(ERROR_INVALID_ACCESS);
enableDiagnosticOption(ERROR_DATA_RACE);
Expand Down Expand Up @@ -185,9 +185,9 @@ bool Logger::parseDiagnosticOptions(char *options)
{
enableDiagnosticOption(DEBUG, isPositive);
}
else if (!strcmp(opt_type, "uninitialised"))
else if (!strcmp(opt_type, "uninitialized"))
{
enableDiagnosticOption(WARNING_UNINITIALISED, isPositive);
enableDiagnosticOption(WARNING_UNINITIALIZED, isPositive);
}
else if (!strcmp(opt_type, "divergence"))
{
Expand Down
2 changes: 1 addition & 1 deletion src/plugins/Uninitialized.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,7 @@ void Uninitialized::checkState(const Memory *memory,

void Uninitialized::logError(unsigned int addrSpace, size_t address) const
{
Context::Message msg(WARNING_UNINITIALISED, m_context);
Context::Message msg(WARNING_UNINITIALIZED, m_context);
msg << "Uninitialized value read from "
<< getAddressSpaceName(addrSpace)
<< " memory address 0x" << hex << address << endl
Expand Down

0 comments on commit 5978c88

Please sign in to comment.