Skip to content
Snippets Groups Projects
Commit d2a9b6da authored by Vijay Pai's avatar Vijay Pai
Browse files

Isolate nullptr to grpc namespace when we must define it ourselves

Change the one non-namespace use of nullptr to NULL (used as an
argument to a C function anyway)
parent 7e06b6ff
No related branches found
No related tags found
No related merge requests found
...@@ -79,6 +79,7 @@ ...@@ -79,6 +79,7 @@
#ifdef GRPC_CXX0X_NO_NULLPTR #ifdef GRPC_CXX0X_NO_NULLPTR
#include <memory> #include <memory>
namespace grpc {
const class { const class {
public: public:
template <class T> template <class T>
...@@ -98,6 +99,7 @@ const class { ...@@ -98,6 +99,7 @@ const class {
private: private:
void operator&() const = delete; void operator&() const = delete;
} nullptr = {}; } nullptr = {};
}
#endif #endif
#ifndef GRPC_CUSTOM_STRING #ifndef GRPC_CUSTOM_STRING
......
...@@ -52,7 +52,7 @@ static double time_double(struct timeval* tv) { ...@@ -52,7 +52,7 @@ static double time_double(struct timeval* tv) {
Timer::Result Timer::Sample() { Timer::Result Timer::Sample() {
struct rusage usage; struct rusage usage;
struct timeval tv; struct timeval tv;
gettimeofday(&tv, nullptr); gettimeofday(&tv, NULL);
getrusage(RUSAGE_SELF, &usage); getrusage(RUSAGE_SELF, &usage);
Result r; Result r;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment