diff options
| author |  Julien Boeuf <jboeuf@google.com> | 2015-11-17 15:05:45 -0800 |
|---|---|---|
| committer | Julien Boeuf <jboeuf@google.com> | 2015-11-17 15:05:45 -0800 |
| commit | 675b5ce861c3de2c741ee1dd71bf8cdd2662eac6 (patch) | |
| tree | a63cbd38d47eea554ae5fef9ef931678689afe63 /src/cpp | |
| parent | b0d1e3d95f9d7764a186a25db7e16f87be027c66 (diff) | |
| parent | ab88da26bad1566d0a0f9a797ec429bd96ae30e2 (diff) | |
Merge branch 'master' of github.com:grpc/grpc into core_creds_api_change
Diffstat (limited to 'src/cpp')
| -rw-r--r-- | src/cpp/util/string_ref.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/cpp/util/string_ref.cc b/src/cpp/util/string_ref.cc index 604134fa9d..66c79a1818 100644 --- a/src/cpp/util/string_ref.cc +++ b/src/cpp/util/string_ref.cc @@ -40,7 +40,7 @@ namespace grpc { -const size_t string_ref::npos; +const size_t string_ref::npos = size_t(-1); string_ref& string_ref::operator=(const string_ref& rhs) { data_ = rhs.data_; |