Merge branch 'c++lame' of github.com:ctiller/grpc into c++lame

pull/10676/head
Craig Tiller 8 years ago
commit 01aa9cc33e
  1. 4
      src/core/lib/support/atomic.h

@ -37,9 +37,9 @@
#include <grpc/support/port_platform.h>
#ifdef GPR_HAS_CXX11_ATOMIC
#include "atomic_with_std.h"
#include "src/core/lib/support/atomic_with_std.h"
#else
#include "atomic_with_atm.h"
#include "src/core/lib/support/atomic_with_atm.h"
#endif
#endif /* GRPC_CORE_LIB_SUPPORT_ATOMIC_H */

Loading…
Cancel
Save