diff options
| author |  Craig Tiller <craig.tiller@gmail.com> | 2015-06-25 07:00:18 -0700 |
|---|---|---|
| committer | Craig Tiller <craig.tiller@gmail.com> | 2015-06-25 07:00:18 -0700 |
| commit | fe8592ee994343821c8c4e906ee3bef3b4444e34 (patch) | |
| tree | a0f1fa88e0ddeb4092567adc51184ac88f0ab78b /src/objective-c/tests/InteropTests.m | |
| parent | f75fc12e3a1a614ee2d5d565742764e47d9aef96 (diff) | |
| parent | 0bf7e48ade52eec336f50dee4c7d22eeb887bb8e (diff) | |
Merge github.com:grpc/grpc into are-includes-sane
Conflicts:
tools/doxygen/Doxyfile.c++.internal
Diffstat (limited to 'src/objective-c/tests/InteropTests.m')
| -rw-r--r-- | src/objective-c/tests/InteropTests.m | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/objective-c/tests/InteropTests.m b/src/objective-c/tests/InteropTests.m index 0a512c17dc..684f7c2ff6 100644 --- a/src/objective-c/tests/InteropTests.m +++ b/src/objective-c/tests/InteropTests.m @@ -36,13 +36,13 @@ #import <UIKit/UIKit.h> #import <XCTest/XCTest.h> -#import <gRPC/GRXWriter+Immediate.h> -#import <gRPC/GRXBufferedPipe.h> -#import <gRPC/ProtoRPC.h> +#import <ProtoRPC/ProtoRPC.h> #import <RemoteTest/Empty.pbobjc.h> #import <RemoteTest/Messages.pbobjc.h> #import <RemoteTest/Test.pbobjc.h> #import <RemoteTest/Test.pbrpc.h> +#import <RxLibrary/GRXBufferedPipe.h> +#import <RxLibrary/GRXWriter+Immediate.h> // Convenience constructors for the generated proto messages: |