more fixes

Author: scotthart

.clang-tidy

@@ -119,6 +119,8 @@ Checks: >
   -readability-use-concise-preprocessor-directives,
   -readability-math-missing-parentheses,
   -readability-enum-initial-value
+  -modernize-use-scoped-lock
+  -readability-redundant-parentheses
 
 # Turn all the warnings from the checks above into errors.
 WarningsAsErrors: "*"

ci/cloudbuild/builds/coverage.sh

@@ -21,8 +21,10 @@ source module ci/cloudbuild/builds/lib/bazel.sh
 source module ci/cloudbuild/builds/lib/cloudcxxrc.sh
 source module ci/cloudbuild/builds/lib/integration.sh
 
-export CC=gcc
-export CXX=g++
+#export CC=gcc
+#export CXX=g++
+export CC=clang
+export CXX=clang++
 
 # Explicitly list the patterns that match hand-crafted code. Excluding the
 # generated code results in a longer list and more maintenance.

google/cloud/bigtable/client.cc

@@ -21,25 +21,24 @@ namespace cloud {
 namespace bigtable {
 GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN
 
-using ::google::cloud::bigtable_internal::MergeOptions;
 using ::google::cloud::internal::OptionsSpan;
 
 StatusOr<PreparedQuery> Client::PrepareQuery(InstanceResource const& instance,
                                              SqlStatement const& statement,
                                              Options opts) {
-  OptionsSpan span(MergeOptions(std::move(opts), opts_));
+  OptionsSpan span(bigtable_internal::MergeOptions(std::move(opts), opts_));
   return conn_->PrepareQuery({instance, statement});
 }
 
 future<StatusOr<PreparedQuery>> Client::AsyncPrepareQuery(
     InstanceResource const& instance, SqlStatement const& statement,
     Options opts) {
-  OptionsSpan span(MergeOptions(std::move(opts), opts_));
+  OptionsSpan span(bigtable_internal::MergeOptions(std::move(opts), opts_));
   return conn_->AsyncPrepareQuery({instance, statement});
 }
 
 RowStream Client::ExecuteQuery(BoundQuery&& bound_query, Options opts) {
-  OptionsSpan span(MergeOptions(std::move(opts), opts_));
+  OptionsSpan span(bigtable_internal::MergeOptions(std::move(opts), opts_));
   return conn_->ExecuteQuery({std::move(bound_query)});
 }