2622ddbcfd
Merge branch 'we-dont-need-no-backup' into one-shouldnt-depend-on-protobufs
...
Conflicts:
include/grpc++/async_unary_call.h
include/grpc++/config.h
include/grpc++/config_protobuf.h
include/grpc++/impl/service_type.h
include/grpc++/stream.h
src/cpp/common/call.cc
2015-06-16 17:30:26 -07:00
c1a2c314fb
Update the Status API
2015-06-16 10:59:46 -07:00
789471cfc6
Client side compiles/links
2015-06-04 16:19:22 -07:00
f9e6adf998
Completion queue binding for new requests API change
...
Move completion queue binding for new requests to the new request
request time, not server instantiation time.
2015-05-06 11:45:59 -07:00
fd2bf675f7
Merge branch 'master' of github.com:grpc/grpc into the-purge-2
...
Conflicts:
include/grpc++/completion_queue.h
2015-04-24 23:24:44 +02:00
c4b6ffb1b6
Add a GrpcLibrary class to wrap grpc_init and grpc_shutdown and convert all the tests to init/shutdown free.
2015-04-24 13:09:40 -07:00
23be280366
Merge branch 'master' of github.com:grpc/grpc into the-purge-2
...
Conflicts:
src/cpp/client/channel.cc
vsprojects/vs2010/grpc++.vcxproj
vsprojects/vs2013/grpc++.vcxproj.filters
2015-04-24 00:38:19 +02:00
3b3097fb7a
Remove an extra unref
2015-04-21 11:47:45 -07:00
b7c2035e83
Merge branch 'master' of https://github.com/grpc/grpc into the-purge-2
...
Conflicts:
test/cpp/end2end/async_end2end_test.cc
test/cpp/end2end/end2end_test.cc
test/cpp/interop/client.cc
2015-04-11 01:53:09 +02:00
0caebbfcfe
Splitting gRPC service class codegen into its own set of files.
2015-04-09 23:08:51 +02:00
a05b8b7b25
Removing a few more references to #include <chrono>
2015-04-08 09:07:20 +02:00
89219162dd
Refactoring std::chrono out.
2015-04-08 05:42:08 +02:00
48bbd000eb
merge upstream and resolve conflict
2015-03-26 23:12:14 -07:00
96e32aa0a5
Merge pull request #1133 from yang-g/cleanup
...
clean up
2015-03-25 12:38:40 -07:00
16c78c922c
Clean up unneeded includes and remove shutdown protobuf library
2015-03-25 10:36:16 -07:00
82dd80abc6
Elminate range-based fors and work around some other limitations in older compilers
2015-03-24 10:36:08 -07:00
993d540e37
covert test to use generic stub
2015-03-19 13:35:49 -07:00
5e36d0d474
Merge pull request #1093 from nicolasnoble/windows
...
Various Windows fixes.
2015-03-19 10:29:47 -07:00
cfd6073a66
Various Windows fixes.
...
-) using dupenv_s instead of getenv_s and calling strdup ourselves.
-) few impossible-to-obtain if checks.
-) various signed/unsigned casting.
-) using time_t instead of time32_t
-) checking output of FormatMessage for failures.
-) don't redefine _WIN32_WINNT without undefining it first.
-) fixed msvc's interlocked casting.
-) renamed AddPort to AddListeningPort.
-) added protobuf's third_party includes to search path.
-) added a missing definition for inet_ntop in mingw32.
-) removed useless declarations.
2015-03-19 04:21:22 +01:00
6baa9b67ad
clang-format c++ code
2015-03-17 10:49:39 -07:00
1ad253d137
expose the server's cq through the generic service object
2015-03-16 13:11:29 -07:00
45c09db87c
sort the tags, this is not necessary, just make it look better
2015-03-13 15:49:35 -07:00
9fbbc7bb13
add one bidi test
2015-03-13 15:33:08 -07:00
4999649653
Rename to AsyncGeneric*
2015-03-12 16:40:19 -07:00
005eb88c45
Rename anonymous to generic globally
2015-03-11 22:17:13 -07:00
Craig Tiller