diff options
| author | Feng Xiao <xfxyjwf@gmail.com> | 2018-08-08 17:14:42 -0700 |
|---|---|---|
| committer | Feng Xiao <xfxyjwf@gmail.com> | 2018-08-08 17:14:42 -0700 |
| commit | a8465b738e5a1f346ece58ea6f82612bcd6659d2 (patch) | |
| tree | b755540a5d7d2cc988eabc7ac594e6abd9da29d1 /src/google/protobuf/stubs/singleton.h | |
| parent | 6bbe197e9c1b6fc38cbdc45e3bf83fa7ced792a3 (diff) | |
| parent | 9bbc4b1fab8262958c172f2d8e87b486c950a051 (diff) | |
| download | protobuf-a8465b738e5a1f346ece58ea6f82612bcd6659d2.tar.gz protobuf-a8465b738e5a1f346ece58ea6f82612bcd6659d2.tar.bz2 protobuf-a8465b738e5a1f346ece58ea6f82612bcd6659d2.zip | |
Merge master branch.
Diffstat (limited to 'src/google/protobuf/stubs/singleton.h')
| -rw-r--r-- | src/google/protobuf/stubs/singleton.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/google/protobuf/stubs/singleton.h b/src/google/protobuf/stubs/singleton.h index 2e6ccbdb..5f0f4610 100644 --- a/src/google/protobuf/stubs/singleton.h +++ b/src/google/protobuf/stubs/singleton.h @@ -45,7 +45,7 @@ class Singleton { } static void ShutDown() { delete instance_; - instance_ = NULL; + instance_ = nullptr; } private: static void Init() { @@ -59,7 +59,7 @@ template<typename T> ProtobufOnceType Singleton<T>::once_; template<typename T> -T* Singleton<T>::instance_ = NULL; +T* Singleton<T>::instance_ = nullptr; } // namespace internal } // namespace protobuf } // namespace google |