Skip to content
This repository has been archived by the owner on Dec 8, 2021. It is now read-only.

Commit

Permalink
chore: simpler include guard style (#144)
Browse files Browse the repository at this point in the history
  • Loading branch information
devjgm authored Jan 30, 2020
1 parent fc2f73b commit 1992545
Show file tree
Hide file tree
Showing 57 changed files with 173 additions and 175 deletions.
12 changes: 5 additions & 7 deletions ci/check-include-guards.gawk
Original file line number Diff line number Diff line change
Expand Up @@ -27,14 +27,12 @@ END {
BEGINFILE {
# The guard must begin with the name of the project.
guard_prefix="GOOGLE_CLOUD_CPP_"
# The guard must end with "_"
guard_suffix="_"
# The guard name is the filename (including path from the root of the
# project), with "/" and "." characters replaced with "_", and all
# characters converted to uppercase:
guard_body=toupper(FILENAME)
gsub("[/\\.]", "_", guard_body)
guard=toupper(guard_prefix guard_body guard_suffix)
guard=toupper(guard_prefix guard_body)
matches=0
}

Expand All @@ -49,19 +47,19 @@ ENDFILE {
# Check only lines that start with #ifndef, #define, or #endif.
/^#ifndef / {
# Ignore lines that do not look like guards at all.
if ($0 !~ "_H_$") { next; }
if ($0 !~ "_H$") { next; }
if (index($0, guard) == 9) {
matches++;
} else {
printf("%s:\n", FILENAME)
printf("expected: #ifndef %s\n", FILENAME, guard)
printf("expected: #ifndef %s\n", guard)
printf(" found: %s\n", $0);
}
}

/^#define / {
# Ignore lines that do not look like guards at all.
if ($0 !~ "_H_$") { next; }
if ($0 !~ "_H$") { next; }
if (index($0, guard) == 9) {
matches++;
} else {
Expand All @@ -73,7 +71,7 @@ ENDFILE {

/^#endif / {
# Ignore lines that do not look like guards at all.
if ($0 !~ "_H_$") { next; }
if ($0 !~ "_H$") { next; }
if (index($0, "// " guard) == 9) {
matches++;
} else {
Expand Down
6 changes: 3 additions & 3 deletions google/cloud/future.h
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@
// See the License for the specific language governing permissions and
// limitations under the License.

#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_FUTURE_H_
#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_FUTURE_H_
#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_FUTURE_H
#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_FUTURE_H

#include "google/cloud/internal/future_then_impl.h"

#endif // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_FUTURE_H_
#endif // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_FUTURE_H
6 changes: 3 additions & 3 deletions google/cloud/future_generic.h
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.

#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_FUTURE_GENERIC_H_
#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_FUTURE_GENERIC_H_
#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_FUTURE_GENERIC_H
#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_FUTURE_GENERIC_H
/**
* @file
*
Expand Down Expand Up @@ -214,4 +214,4 @@ inline future<typename internal::make_ready_return<T>::type> make_ready_future(
} // namespace cloud
} // namespace google

#endif // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_FUTURE_GENERIC_H_
#endif // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_FUTURE_GENERIC_H
6 changes: 3 additions & 3 deletions google/cloud/future_void.h
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.

#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_FUTURE_VOID_H_
#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_FUTURE_VOID_H_
#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_FUTURE_VOID_H
#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_FUTURE_VOID_H
/**
* @file
*
Expand Down Expand Up @@ -195,4 +195,4 @@ inline future<void> make_ready_future() {
} // namespace cloud
} // namespace google

#endif // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_FUTURE_VOID_H_
#endif // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_FUTURE_VOID_H
6 changes: 3 additions & 3 deletions google/cloud/grpc_utils/async_operation.h
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.

#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_GRPC_UTILS_ASYNC_OPERATION_H_
#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_GRPC_UTILS_ASYNC_OPERATION_H_
#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_GRPC_UTILS_ASYNC_OPERATION_H
#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_GRPC_UTILS_ASYNC_OPERATION_H

#include "google/cloud/grpc_utils/version.h"
#include <grpcpp/grpcpp.h>
Expand Down Expand Up @@ -61,4 +61,4 @@ class AsyncOperation {
} // namespace cloud
} // namespace google

#endif // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_GRPC_UTILS_ASYNC_OPERATION_H_
#endif // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_GRPC_UTILS_ASYNC_OPERATION_H
6 changes: 3 additions & 3 deletions google/cloud/grpc_utils/completion_queue.h
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.

#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_GRPC_UTILS_COMPLETION_QUEUE_H_
#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_GRPC_UTILS_COMPLETION_QUEUE_H_
#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_GRPC_UTILS_COMPLETION_QUEUE_H
#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_GRPC_UTILS_COMPLETION_QUEUE_H

#include "google/cloud/future.h"
#include "google/cloud/grpc_utils/internal/async_read_stream_impl.h"
Expand Down Expand Up @@ -197,4 +197,4 @@ class CompletionQueue {
} // namespace cloud
} // namespace google

#endif // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_GRPC_UTILS_COMPLETION_QUEUE_H_
#endif // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_GRPC_UTILS_COMPLETION_QUEUE_H
6 changes: 3 additions & 3 deletions google/cloud/grpc_utils/grpc_error_delegate.h
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.

#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_GRPC_UTILS_GRPC_ERROR_DELEGATE_H_
#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_GRPC_UTILS_GRPC_ERROR_DELEGATE_H_
#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_GRPC_UTILS_GRPC_ERROR_DELEGATE_H
#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_GRPC_UTILS_GRPC_ERROR_DELEGATE_H

#include "google/cloud/grpc_utils/version.h"
#include "google/cloud/status.h"
Expand Down Expand Up @@ -49,4 +49,4 @@ google::cloud::Status MakeStatusFromRpcError(google::rpc::Status const& status);
} // namespace cloud
} // namespace google

#endif // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_GRPC_UTILS_GRPC_ERROR_DELEGATE_H_
#endif // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_GRPC_UTILS_GRPC_ERROR_DELEGATE_H
6 changes: 3 additions & 3 deletions google/cloud/grpc_utils/internal/async_read_stream_impl.h
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.

#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_GRPC_UTILS_INTERNAL_ASYNC_READ_STREAM_IMPL_H_
#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_GRPC_UTILS_INTERNAL_ASYNC_READ_STREAM_IMPL_H_
#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_GRPC_UTILS_INTERNAL_ASYNC_READ_STREAM_IMPL_H
#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_GRPC_UTILS_INTERNAL_ASYNC_READ_STREAM_IMPL_H

#include "google/cloud/grpc_utils/internal/completion_queue_impl.h"
#include "google/cloud/grpc_utils/version.h"
Expand Down Expand Up @@ -339,4 +339,4 @@ MakeAsyncReadStreamImpl(OnReadHandler&& on_read, OnFinishHandler&& on_finish) {
} // namespace cloud
} // namespace google

#endif // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_GRPC_UTILS_INTERNAL_ASYNC_READ_STREAM_IMPL_H_
#endif // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_GRPC_UTILS_INTERNAL_ASYNC_READ_STREAM_IMPL_H
6 changes: 3 additions & 3 deletions google/cloud/grpc_utils/internal/completion_queue_impl.h
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.

#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_GRPC_UTILS_INTERNAL_COMPLETION_QUEUE_IMPL_H_
#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_GRPC_UTILS_INTERNAL_COMPLETION_QUEUE_IMPL_H_
#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_GRPC_UTILS_INTERNAL_COMPLETION_QUEUE_IMPL_H
#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_GRPC_UTILS_INTERNAL_COMPLETION_QUEUE_IMPL_H

#include "google/cloud/future.h"
#include "google/cloud/grpc_utils/async_operation.h"
Expand Down Expand Up @@ -290,4 +290,4 @@ class CompletionQueueImpl {
} // namespace cloud
} // namespace google

#endif // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_GRPC_UTILS_INTERNAL_COMPLETION_QUEUE_IMPL_H_
#endif // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_GRPC_UTILS_INTERNAL_COMPLETION_QUEUE_IMPL_H
6 changes: 3 additions & 3 deletions google/cloud/grpc_utils/version.h
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.

#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_GRPC_UTILS_VERSION_H_
#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_GRPC_UTILS_VERSION_H_
#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_GRPC_UTILS_VERSION_H
#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_GRPC_UTILS_VERSION_H

#include "google/cloud/grpc_utils/version_info.h"
#include "google/cloud/version.h"
Expand Down Expand Up @@ -82,4 +82,4 @@ std::string version_string();
} // namespace cloud
} // namespace google

#endif // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_GRPC_UTILS_VERSION_H_
#endif // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_GRPC_UTILS_VERSION_H
6 changes: 3 additions & 3 deletions google/cloud/grpc_utils/version_info.h
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,11 @@
// See the License for the specific language governing permissions and
// limitations under the License.

#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_GRPC_UTILS_VERSION_INFO_H_
#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_GRPC_UTILS_VERSION_INFO_H_
#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_GRPC_UTILS_VERSION_INFO_H
#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_GRPC_UTILS_VERSION_INFO_H

#define GOOGLE_CLOUD_CPP_GRPC_UTILS_VERSION_MAJOR 0
#define GOOGLE_CLOUD_CPP_GRPC_UTILS_VERSION_MINOR 1
#define GOOGLE_CLOUD_CPP_GRPC_UTILS_VERSION_PATCH 0

#endif // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_GRPC_UTILS_VERSION_INFO_H_
#endif // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_GRPC_UTILS_VERSION_INFO_H
6 changes: 3 additions & 3 deletions google/cloud/grpc_utils/version_info.h.in
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,11 @@
// See the License for the specific language governing permissions and
// limitations under the License.

#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_GRPC_UTILS_VERSION_INFO_H_
#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_GRPC_UTILS_VERSION_INFO_H_
#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_GRPC_UTILS_VERSION_INFO_H
#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_GRPC_UTILS_VERSION_INFO_H

#define GOOGLE_CLOUD_CPP_GRPC_UTILS_VERSION_MAJOR @GOOGLE_CLOUD_CPP_GRPC_UTILS_VERSION_MAJOR@
#define GOOGLE_CLOUD_CPP_GRPC_UTILS_VERSION_MINOR @GOOGLE_CLOUD_CPP_GRPC_UTILS_VERSION_MINOR@
#define GOOGLE_CLOUD_CPP_GRPC_UTILS_VERSION_PATCH @GOOGLE_CLOUD_CPP_GRPC_UTILS_VERSION_PATCH@

#endif // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_GRPC_UTILS_VERSION_INFO_H_
#endif // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_GRPC_UTILS_VERSION_INFO_H
6 changes: 3 additions & 3 deletions google/cloud/iam_binding.h
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.

#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_IAM_BINDING_H_
#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_IAM_BINDING_H_
#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_IAM_BINDING_H
#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_IAM_BINDING_H

#include "google/cloud/version.h"
#include <set>
Expand Down Expand Up @@ -46,4 +46,4 @@ class IamBinding {
} // namespace cloud
} // namespace google

#endif // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_IAM_BINDING_H_
#endif // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_IAM_BINDING_H
6 changes: 3 additions & 3 deletions google/cloud/iam_bindings.h
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.

#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_IAM_BINDINGS_H_
#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_IAM_BINDINGS_H_
#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_IAM_BINDINGS_H
#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_IAM_BINDINGS_H

#include "google/cloud/iam_binding.h"
#include "google/cloud/version.h"
Expand Down Expand Up @@ -185,4 +185,4 @@ std::ostream& operator<<(std::ostream& os, IamBindings const& rhs);
} // namespace cloud
} // namespace google

#endif // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_IAM_BINDINGS_H_
#endif // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_IAM_BINDINGS_H
6 changes: 3 additions & 3 deletions google/cloud/iam_policy.h
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.

#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_IAM_POLICY_H_
#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_IAM_POLICY_H_
#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_IAM_POLICY_H
#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_IAM_POLICY_H

#include "google/cloud/iam_bindings.h"

Expand Down Expand Up @@ -70,4 +70,4 @@ std::ostream& operator<<(std::ostream& os, IamPolicy const& rhs);
} // namespace cloud
} // namespace google

#endif // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_IAM_POLICY_H_
#endif // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_IAM_POLICY_H
6 changes: 3 additions & 3 deletions google/cloud/internal/backoff_policy.h
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.

#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_INTERNAL_BACKOFF_POLICY_H_
#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_INTERNAL_BACKOFF_POLICY_H_
#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_INTERNAL_BACKOFF_POLICY_H
#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_INTERNAL_BACKOFF_POLICY_H

#include "google/cloud/internal/random.h"
#include "google/cloud/internal/throw_delegate.h"
Expand Down Expand Up @@ -152,4 +152,4 @@ class ExponentialBackoffPolicy : public BackoffPolicy {
} // namespace cloud
} // namespace google

#endif // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_INTERNAL_BACKOFF_POLICY_H_
#endif // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_INTERNAL_BACKOFF_POLICY_H
6 changes: 3 additions & 3 deletions google/cloud/internal/big_endian.h
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.

#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_INTERNAL_BIG_ENDIAN_H_
#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_INTERNAL_BIG_ENDIAN_H_
#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_INTERNAL_BIG_ENDIAN_H
#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_INTERNAL_BIG_ENDIAN_H

#include "google/cloud/status.h"
#include "google/cloud/status_or.h"
Expand Down Expand Up @@ -84,4 +84,4 @@ StatusOr<T> DecodeBigEndian(std::string const& value) {
} // namespace cloud
} // namespace google

#endif // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_INTERNAL_BIG_ENDIAN_H_
#endif // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_INTERNAL_BIG_ENDIAN_H
6 changes: 3 additions & 3 deletions google/cloud/internal/build_info.h
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.

#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_INTERNAL_BUILD_INFO_H_
#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_INTERNAL_BUILD_INFO_H_
#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_INTERNAL_BUILD_INFO_H
#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_INTERNAL_BUILD_INFO_H

#include "google/cloud/version.h"

Expand All @@ -35,4 +35,4 @@ std::string build_metadata();
} // namespace cloud
} // namespace google

#endif // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_INTERNAL_BUILD_INFO_H_
#endif // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_INTERNAL_BUILD_INFO_H
6 changes: 3 additions & 3 deletions google/cloud/internal/compiler_info.h
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.

#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_INTERNAL_COMPILER_INFO_H_
#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_INTERNAL_COMPILER_INFO_H_
#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_INTERNAL_COMPILER_INFO_H
#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_INTERNAL_COMPILER_INFO_H

#include "google/cloud/version.h"

Expand Down Expand Up @@ -54,4 +54,4 @@ std::string LanguageVersion();
} // namespace cloud
} // namespace google

#endif // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_INTERNAL_COMPILER_INFO_H_
#endif // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_INTERNAL_COMPILER_INFO_H
6 changes: 3 additions & 3 deletions google/cloud/internal/conjunction.h
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.

#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_INTERNAL_CONJUNCTION_H_
#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_INTERNAL_CONJUNCTION_H_
#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_INTERNAL_CONJUNCTION_H
#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_INTERNAL_CONJUNCTION_H

#include "google/cloud/version.h"
#include <type_traits>
Expand Down Expand Up @@ -43,4 +43,4 @@ struct conjunction<B1, Bn...>
} // namespace cloud
} // namespace google

#endif // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_INTERNAL_CONJUNCTION_H_
#endif // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_INTERNAL_CONJUNCTION_H
6 changes: 3 additions & 3 deletions google/cloud/internal/disjunction.h
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.

#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_INTERNAL_DISJUNCTION_H_
#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_INTERNAL_DISJUNCTION_H_
#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_INTERNAL_DISJUNCTION_H
#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_INTERNAL_DISJUNCTION_H

#include "google/cloud/version.h"
#include <type_traits>
Expand Down Expand Up @@ -43,4 +43,4 @@ struct disjunction<B1, Bn...>
} // namespace cloud
} // namespace google

#endif // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_INTERNAL_DISJUNCTION_H_
#endif // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_INTERNAL_DISJUNCTION_H
6 changes: 3 additions & 3 deletions google/cloud/internal/filesystem.h
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.

#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_INTERNAL_FILESYSTEM_H_
#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_INTERNAL_FILESYSTEM_H_
#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_INTERNAL_FILESYSTEM_H
#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_INTERNAL_FILESYSTEM_H

#include "google/cloud/version.h"
#include <cinttypes>
Expand Down Expand Up @@ -171,4 +171,4 @@ std::uintmax_t file_size(std::string const& path, std::error_code& ec) noexcept;
} // namespace cloud
} // namespace google

#endif // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_INTERNAL_FILESYSTEM_H_
#endif // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_INTERNAL_FILESYSTEM_H
Loading

0 comments on commit 1992545

Please sign in to comment.