diff options
author | Nicolas "Pixel" Noble <pixel@nobis-crew.org> | 2015-04-10 04:46:03 +0200 |
---|---|---|
committer | Nicolas "Pixel" Noble <pixel@nobis-crew.org> | 2015-04-10 18:28:13 +0200 |
commit | a9ef765bfcd2fbc8c588ea1cdcb5681547fc364f (patch) | |
tree | 994980c251f49f07973212a736fc1a6b88cfbd66 /include/grpc++/impl/sync.h | |
parent | 9f72864caf46f292d0f0ce34baa5ec0e1beb7739 (diff) | |
parent | e2ecc508415b95526563eb7b70510e015b9a004e (diff) |
Merge branch 'master' of github.com:grpc/grpc into sanity
Conflicts:
tools/run_tests/run_tests.py
Diffstat (limited to 'include/grpc++/impl/sync.h')
-rw-r--r-- | include/grpc++/impl/sync.h | 45 |
1 files changed, 45 insertions, 0 deletions
diff --git a/include/grpc++/impl/sync.h b/include/grpc++/impl/sync.h new file mode 100644 index 0000000000..2f41d2bdeb --- /dev/null +++ b/include/grpc++/impl/sync.h @@ -0,0 +1,45 @@ +/* + * + * Copyright 2015, Google Inc. + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are + * met: + * + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above + * copyright notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. + * * Neither the name of Google Inc. nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT + * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * + */ + +#ifndef GRPCXX_IMPL_SYNC_H +#define GRPCXX_IMPL_SYNC_H + +#include <grpc++/config.h> + +#ifdef GRPC_CXX0X_NO_THREAD +#include <grpc++/impl/sync_no_cxx11.h> +#else +#include <grpc++/impl/sync_cxx11.h> +#endif + +#endif // GRPCXX_IMPL_SYNC_H |