diff options
| author |  Vijay Pai <vpai@google.com> | 2018-03-01 11:48:29 -0800 |
|---|---|---|
| committer | Vijay Pai <vpai@google.com> | 2018-03-01 11:48:29 -0800 |
| commit | b357f2f548884e0f1766b5b1c3b12e1aa64642cc (patch) | |
| tree | 84a5f405562ee887fe79fb36b8a7fe42773933c6 /src/core/lib/gprpp | |
| parent | 2fe87b09055cd256cdce038c4c70d92b955c991b (diff) | |
| parent | ccd1d55807bdb13b661dcf1d651468b2d98ff5af (diff) | |
Merge branch 'master' into 2phase_thd
Diffstat (limited to 'src/core/lib/gprpp')
| -rw-r--r-- | src/core/lib/gprpp/orphanable.h | 1 | ||||
| -rw-r--r-- | src/core/lib/gprpp/ref_counted.h | 2 | ||||
| -rw-r--r-- | src/core/lib/gprpp/ref_counted_ptr.h | 1 |
3 files changed, 4 insertions, 0 deletions
diff --git a/src/core/lib/gprpp/orphanable.h b/src/core/lib/gprpp/orphanable.h index 9e9e7f015f..a5bc8d8efc 100644 --- a/src/core/lib/gprpp/orphanable.h +++ b/src/core/lib/gprpp/orphanable.h @@ -24,6 +24,7 @@ #include <grpc/support/log.h> #include <grpc/support/sync.h> +#include <cinttypes> #include <memory> #include "src/core/lib/debug/trace.h" diff --git a/src/core/lib/gprpp/ref_counted.h b/src/core/lib/gprpp/ref_counted.h index 02b115a40e..46bfaf7fb8 100644 --- a/src/core/lib/gprpp/ref_counted.h +++ b/src/core/lib/gprpp/ref_counted.h @@ -24,6 +24,8 @@ #include <grpc/support/log.h> #include <grpc/support/sync.h> +#include <cinttypes> + #include "src/core/lib/debug/trace.h" #include "src/core/lib/gprpp/abstract.h" #include "src/core/lib/gprpp/debug_location.h" diff --git a/src/core/lib/gprpp/ref_counted_ptr.h b/src/core/lib/gprpp/ref_counted_ptr.h index 72088e76ef..388e2ec410 100644 --- a/src/core/lib/gprpp/ref_counted_ptr.h +++ b/src/core/lib/gprpp/ref_counted_ptr.h @@ -33,6 +33,7 @@ template <typename T> class RefCountedPtr { public: RefCountedPtr() {} + RefCountedPtr(std::nullptr_t) {} // If value is non-null, we take ownership of a ref to it. explicit RefCountedPtr(T* value) { value_ = value; } |