fixed header guards
fixed method signature to match the one in the superclass
removed extraneous semicolon
fixed formatting of error message
fixed type check warning
fixed comparison
added config parameter
Merge remote-tracking branch 'origin/cgudrian/OP-1664_clang_warnings' into next
Fixed a gcc compiler warning that was a result of clang compiler warning cleanup.