diff options
| author |  Yash Tibrewal <yashkt@google.com> | 2017-11-07 17:02:23 -0800 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2017-11-07 17:02:23 -0800 |
| commit | d9da7387b8057f3bd99a417a5ee905377bce9296 (patch) | |
| tree | df5e16acf65e083ce2b56a9543eba918ef35b451 /include | |
| parent | c03867ff224a98dab5a93b3ba70b95c46f05a440 (diff) | |
| parent | 67c0effd324b3fa86c13dabe5a63f66d48672e30 (diff) | |
Merge pull request #13147 from yashykt/testc++ize
Convert test/core to C++
Diffstat (limited to 'include')
| -rw-r--r-- | include/grpc/impl/codegen/atm.h | 8 | ||||
| -rw-r--r-- | include/grpc/impl/codegen/atm_gcc_atomic.h | 8 | ||||
| -rw-r--r-- | include/grpc/support/cmdline.h | 2 |
3 files changed, 17 insertions, 1 deletions
diff --git a/include/grpc/impl/codegen/atm.h b/include/grpc/impl/codegen/atm.h index e626358b73..00d83f0604 100644 --- a/include/grpc/impl/codegen/atm.h +++ b/include/grpc/impl/codegen/atm.h @@ -79,9 +79,17 @@ #error could not determine platform for atm #endif +#ifdef __cplusplus +extern "C" { +#endif + /** Adds \a delta to \a *value, clamping the result to the range specified by \a min and \a max. Returns the new value. */ gpr_atm gpr_atm_no_barrier_clamped_add(gpr_atm* value, gpr_atm delta, gpr_atm min, gpr_atm max); +#ifdef __cplusplus +} +#endif + #endif /* GRPC_IMPL_CODEGEN_ATM_H */ diff --git a/include/grpc/impl/codegen/atm_gcc_atomic.h b/include/grpc/impl/codegen/atm_gcc_atomic.h index 61ec7df52c..5879708548 100644 --- a/include/grpc/impl/codegen/atm_gcc_atomic.h +++ b/include/grpc/impl/codegen/atm_gcc_atomic.h @@ -23,6 +23,10 @@ __atomic_* interface. */ #include <grpc/impl/codegen/port_platform.h> +#ifdef __cplusplus +extern "C" { +#endif + typedef intptr_t gpr_atm; #define GPR_ATM_MAX INTPTR_MAX #define GPR_ATM_MIN INTPTR_MIN @@ -80,4 +84,8 @@ static __inline int gpr_atm_full_cas(gpr_atm* p, gpr_atm o, gpr_atm n) { #define gpr_atm_full_xchg(p, n) \ GPR_ATM_INC_CAS_THEN(__atomic_exchange_n((p), (n), __ATOMIC_ACQ_REL)) +#ifdef __cplusplus +} +#endif + #endif /* GRPC_IMPL_CODEGEN_ATM_GCC_ATOMIC_H */ diff --git a/include/grpc/support/cmdline.h b/include/grpc/support/cmdline.h index 6c60b77ce2..c34a109fbd 100644 --- a/include/grpc/support/cmdline.h +++ b/include/grpc/support/cmdline.h @@ -65,7 +65,7 @@ GPRAPI void gpr_cmdline_add_flag(gpr_cmdline* cl, const char* name, const char* help, int* value); /** And for a string */ GPRAPI void gpr_cmdline_add_string(gpr_cmdline* cl, const char* name, - const char* help, char** value); + const char* help, const char** value); /** Set a callback for non-named arguments */ GPRAPI void gpr_cmdline_on_extra_arg( gpr_cmdline* cl, const char* name, const char* help, |