diff options
| author |  Julien Boeuf <jboeuf@google.com> | 2015-08-24 23:55:43 -0700 |
|---|---|---|
| committer | Julien Boeuf <jboeuf@google.com> | 2015-08-24 23:55:43 -0700 |
| commit | 0382bfae38ca7594e55e941087f8095eb7493a4e (patch) | |
| tree | 925bd59036b7e27fb4ea4a7aa8d59862f413fc2b /src/cpp/util | |
| parent | 8fd915ab8dfaf2a451fc46ecf225ea4d4400c64b (diff) | |
| parent | e289e52436505e73440854ee6f8e5ddda5750929 (diff) | |
Merge branch 'master' of github.com:grpc/grpc into cpp_string_ref
Diffstat (limited to 'src/cpp/util')
| -rw-r--r-- | src/cpp/util/byte_buffer.cc | 2 | ||||
| -rw-r--r-- | src/cpp/util/slice.cc | 2 | ||||
| -rw-r--r-- | src/cpp/util/status.cc | 2 | ||||
| -rw-r--r-- | src/cpp/util/string_ref.cc | 2 | ||||
| -rw-r--r-- | src/cpp/util/time.cc | 4 |
5 files changed, 6 insertions, 6 deletions
diff --git a/src/cpp/util/byte_buffer.cc b/src/cpp/util/byte_buffer.cc index a66c92c3e1..e46e656beb 100644 --- a/src/cpp/util/byte_buffer.cc +++ b/src/cpp/util/byte_buffer.cc @@ -32,7 +32,7 @@ */ #include <grpc/byte_buffer_reader.h> -#include <grpc++/byte_buffer.h> +#include <grpc++/support/byte_buffer.h> namespace grpc { diff --git a/src/cpp/util/slice.cc b/src/cpp/util/slice.cc index 57370dabc6..7e88423b6c 100644 --- a/src/cpp/util/slice.cc +++ b/src/cpp/util/slice.cc @@ -31,7 +31,7 @@ * */ -#include <grpc++/slice.h> +#include <grpc++/support/slice.h> namespace grpc { diff --git a/src/cpp/util/status.cc b/src/cpp/util/status.cc index 5bb9eda3d9..ad9850cf07 100644 --- a/src/cpp/util/status.cc +++ b/src/cpp/util/status.cc @@ -31,7 +31,7 @@ * */ -#include <grpc++/status.h> +#include <grpc++/support/status.h> namespace grpc { diff --git a/src/cpp/util/string_ref.cc b/src/cpp/util/string_ref.cc index 7f91ca95b4..8483e8c2ee 100644 --- a/src/cpp/util/string_ref.cc +++ b/src/cpp/util/string_ref.cc @@ -31,7 +31,7 @@ * */ -#include <grpc++/string_ref.h> +#include <grpc++/support/string_ref.h> #include <string.h> diff --git a/src/cpp/util/time.cc b/src/cpp/util/time.cc index 799c597e0b..b3401eb26b 100644 --- a/src/cpp/util/time.cc +++ b/src/cpp/util/time.cc @@ -31,12 +31,12 @@ * */ -#include <grpc++/config.h> +#include <grpc++/support/config.h> #ifndef GRPC_CXX0X_NO_CHRONO #include <grpc/support/time.h> -#include <grpc++/time.h> +#include <grpc++/support/time.h> using std::chrono::duration_cast; using std::chrono::nanoseconds; |