Repository: orc Updated Branches: refs/heads/master ff6394f06 -> 8f4fcd120
ORC-329: [C++] Fix error: zero as null pointer constant Fixes #238 Signed-off-by: Deepak Majeti <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/orc/repo Commit: http://git-wip-us.apache.org/repos/asf/orc/commit/8f4fcd12 Tree: http://git-wip-us.apache.org/repos/asf/orc/tree/8f4fcd12 Diff: http://git-wip-us.apache.org/repos/asf/orc/diff/8f4fcd12 Branch: refs/heads/master Commit: 8f4fcd120c2be3b687841c8e22814e21f44985b2 Parents: ff6394f Author: Gang Wu <[email protected]> Authored: Mon Apr 2 14:20:22 2018 -0700 Committer: Deepak Majeti <[email protected]> Committed: Tue Apr 3 21:08:07 2018 -0400 ---------------------------------------------------------------------- tools/src/CSVFileImport.cc | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/orc/blob/8f4fcd12/tools/src/CSVFileImport.cc ---------------------------------------------------------------------- diff --git a/tools/src/CSVFileImport.cc b/tools/src/CSVFileImport.cc index f2eadfd..d40d5b5 100644 --- a/tools/src/CSVFileImport.cc +++ b/tools/src/CSVFileImport.cc @@ -45,7 +45,7 @@ std::string extractColumn(std::string s, uint64_t colIndex) { static const char* GetDate(void) { static char buf[200]; - time_t t = time(NULL); + time_t t = time(nullptr); struct tm* p = localtime(&t); strftime(buf, sizeof(buf), "[%Y-%m-%d %H:%M:%S]", p); return buf; @@ -439,13 +439,13 @@ int main(int argc, char* argv[]) { } struct timeval t_start, t_end; - gettimeofday(&t_start, NULL); + gettimeofday(&t_start, nullptr); clock_t c_start = clock(); writer->add(*rowBatch); totalCPUTime += (clock() - c_start); - gettimeofday(&t_end, NULL); + gettimeofday(&t_end, nullptr); totalElapsedTime += (static_cast<double>(t_end.tv_sec - t_start.tv_sec) * 1000000.0 + static_cast<double>(t_end.tv_usec - t_start.tv_usec)) / 1000000.0; @@ -453,13 +453,13 @@ int main(int argc, char* argv[]) { } struct timeval t_start, t_end; - gettimeofday(&t_start, NULL); + gettimeofday(&t_start, nullptr); clock_t c_start = clock(); writer->close(); totalCPUTime += (clock() - c_start); - gettimeofday(&t_end, NULL); + gettimeofday(&t_end, nullptr); totalElapsedTime += (static_cast<double>(t_end.tv_sec - t_start.tv_sec) * 1000000.0 + static_cast<double>(t_end.tv_usec - t_start.tv_usec)) / 1000000.0;
