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

Commit b3720d5

Browse files
devjgmdevjgm
authored
fix: change include guard prefix to GOOGLE_CLOUD_CPP_ (#1456)
* fix: change include guard prefix to GOOGLE_CLOUD_CPP_ This makes the include guard prefix here match prefix used in the `-cpp` repo, where this code will be moving to. Fixes: googleapis/google-cloud-cpp#3603 * fixed version_info
1 parent 4ecdc32 commit b3720d5

File tree

90 files changed

+268
-268
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

90 files changed

+268
-268
lines changed

‎ci/check-include-guards.gawk‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ END {
2626
# Reset the state at the beginning of each file.
2727
BEGINFILE {
2828
# The guard must begin with the name of the project.
29-
guard_prefix="GOOGLE_CLOUD_CPP_SPANNER_"
29+
guard_prefix="GOOGLE_CLOUD_CPP_"
3030
# The guard name is the filename (including path from the root of the
3131
# project), with "/" and "." characters replaced with "_", and all
3232
# characters converted to uppercase:

‎google/cloud/spanner/backoff_policy.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
// See the License for the specific language governing permissions and
1313
// limitations under the License.
1414

15-
#ifndef GOOGLE_CLOUD_CPP_SPANNER_GOOGLE_CLOUD_SPANNER_BACKOFF_POLICY_H
16-
#define GOOGLE_CLOUD_CPP_SPANNER_GOOGLE_CLOUD_SPANNER_BACKOFF_POLICY_H
15+
#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SPANNER_BACKOFF_POLICY_H
16+
#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SPANNER_BACKOFF_POLICY_H
1717

1818
#include "google/cloud/spanner/version.h"
1919
#include "google/cloud/internal/backoff_policy.h"
@@ -35,4 +35,4 @@ using ExponentialBackoffPolicy =
3535
} // namespace cloud
3636
} // namespace google
3737

38-
#endif // GOOGLE_CLOUD_CPP_SPANNER_GOOGLE_CLOUD_SPANNER_BACKOFF_POLICY_H
38+
#endif // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SPANNER_BACKOFF_POLICY_H

‎google/cloud/spanner/backup.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
// See the License for the specific language governing permissions and
1313
// limitations under the License.
1414

15-
#ifndef GOOGLE_CLOUD_CPP_SPANNER_GOOGLE_CLOUD_SPANNER_BACKUP_H
16-
#define GOOGLE_CLOUD_CPP_SPANNER_GOOGLE_CLOUD_SPANNER_BACKUP_H
15+
#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SPANNER_BACKUP_H
16+
#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SPANNER_BACKUP_H
1717

1818
#include "google/cloud/spanner/instance.h"
1919
#include "google/cloud/spanner/version.h"
@@ -78,4 +78,4 @@ class Backup {
7878
} // namespace cloud
7979
} // namespace google
8080

81-
#endif // GOOGLE_CLOUD_CPP_SPANNER_GOOGLE_CLOUD_SPANNER_BACKUP_H
81+
#endif // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SPANNER_BACKUP_H

‎google/cloud/spanner/batch_dml_result.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
// See the License for the specific language governing permissions and
1313
// limitations under the License.
1414

15-
#ifndef GOOGLE_CLOUD_CPP_SPANNER_GOOGLE_CLOUD_SPANNER_BATCH_DML_RESULT_H
16-
#define GOOGLE_CLOUD_CPP_SPANNER_GOOGLE_CLOUD_SPANNER_BATCH_DML_RESULT_H
15+
#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SPANNER_BATCH_DML_RESULT_H
16+
#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SPANNER_BATCH_DML_RESULT_H
1717

1818
#include "google/cloud/spanner/version.h"
1919
#include "google/cloud/status.h"
@@ -56,4 +56,4 @@ struct BatchDmlResult {
5656
} // namespace cloud
5757
} // namespace google
5858

59-
#endif // GOOGLE_CLOUD_CPP_SPANNER_GOOGLE_CLOUD_SPANNER_BATCH_DML_RESULT_H
59+
#endif // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SPANNER_BATCH_DML_RESULT_H

‎google/cloud/spanner/benchmarks/benchmarks_config.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
// See the License for the specific language governing permissions and
1313
// limitations under the License.
1414

15-
#ifndef GOOGLE_CLOUD_CPP_SPANNER_GOOGLE_CLOUD_SPANNER_BENCHMARKS_BENCHMARKS_CONFIG_H
16-
#define GOOGLE_CLOUD_CPP_SPANNER_GOOGLE_CLOUD_SPANNER_BENCHMARKS_BENCHMARKS_CONFIG_H
15+
#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SPANNER_BENCHMARKS_BENCHMARKS_CONFIG_H
16+
#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SPANNER_BENCHMARKS_BENCHMARKS_CONFIG_H
1717

1818
#include "google/cloud/spanner/version.h"
1919
#include "google/cloud/status_or.h"
@@ -58,4 +58,4 @@ google::cloud::StatusOr<Config> ParseArgs(std::vector<std::string> args);
5858
} // namespace cloud
5959
} // namespace google
6060

61-
#endif // GOOGLE_CLOUD_CPP_SPANNER_GOOGLE_CLOUD_SPANNER_BENCHMARKS_BENCHMARKS_CONFIG_H
61+
#endif // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SPANNER_BENCHMARKS_BENCHMARKS_CONFIG_H

‎google/cloud/spanner/bytes.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
// See the License for the specific language governing permissions and
1313
// limitations under the License.
1414

15-
#ifndef GOOGLE_CLOUD_CPP_SPANNER_GOOGLE_CLOUD_SPANNER_BYTES_H
16-
#define GOOGLE_CLOUD_CPP_SPANNER_GOOGLE_CLOUD_SPANNER_BYTES_H
15+
#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SPANNER_BYTES_H
16+
#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SPANNER_BYTES_H
1717

1818
#include "google/cloud/spanner/version.h"
1919
#include "google/cloud/status_or.h"
@@ -159,4 +159,4 @@ class Bytes {
159159
} // namespace cloud
160160
} // namespace google
161161

162-
#endif // GOOGLE_CLOUD_CPP_SPANNER_GOOGLE_CLOUD_SPANNER_BYTES_H
162+
#endif // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SPANNER_BYTES_H

‎google/cloud/spanner/client.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
// See the License for the specific language governing permissions and
1313
// limitations under the License.
1414

15-
#ifndef GOOGLE_CLOUD_CPP_SPANNER_GOOGLE_CLOUD_SPANNER_CLIENT_H
16-
#define GOOGLE_CLOUD_CPP_SPANNER_GOOGLE_CLOUD_SPANNER_CLIENT_H
15+
#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SPANNER_CLIENT_H
16+
#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SPANNER_CLIENT_H
1717

1818
#include "google/cloud/spanner/backoff_policy.h"
1919
#include "google/cloud/spanner/batch_dml_result.h"
@@ -665,4 +665,4 @@ std::shared_ptr<Connection> MakeConnection(
665665
} // namespace cloud
666666
} // namespace google
667667

668-
#endif // GOOGLE_CLOUD_CPP_SPANNER_GOOGLE_CLOUD_SPANNER_CLIENT_H
668+
#endif // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SPANNER_CLIENT_H

‎google/cloud/spanner/client_options.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
// See the License for the specific language governing permissions and
1313
// limitations under the License.
1414

15-
#ifndef GOOGLE_CLOUD_CPP_SPANNER_GOOGLE_CLOUD_SPANNER_CLIENT_OPTIONS_H
16-
#define GOOGLE_CLOUD_CPP_SPANNER_GOOGLE_CLOUD_SPANNER_CLIENT_OPTIONS_H
15+
#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SPANNER_CLIENT_OPTIONS_H
16+
#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SPANNER_CLIENT_OPTIONS_H
1717

1818
#include "google/cloud/spanner/query_options.h"
1919
#include "google/cloud/spanner/version.h"
@@ -62,4 +62,4 @@ class ClientOptions {
6262
} // namespace cloud
6363
} // namespace google
6464

65-
#endif // GOOGLE_CLOUD_CPP_SPANNER_GOOGLE_CLOUD_SPANNER_CLIENT_OPTIONS_H
65+
#endif // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SPANNER_CLIENT_OPTIONS_H

‎google/cloud/spanner/commit_result.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
// See the License for the specific language governing permissions and
1313
// limitations under the License.
1414

15-
#ifndef GOOGLE_CLOUD_CPP_SPANNER_GOOGLE_CLOUD_SPANNER_COMMIT_RESULT_H
16-
#define GOOGLE_CLOUD_CPP_SPANNER_GOOGLE_CLOUD_SPANNER_COMMIT_RESULT_H
15+
#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SPANNER_COMMIT_RESULT_H
16+
#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SPANNER_COMMIT_RESULT_H
1717

1818
#include "google/cloud/spanner/timestamp.h"
1919
#include "google/cloud/spanner/version.h"
@@ -36,4 +36,4 @@ struct CommitResult {
3636
} // namespace cloud
3737
} // namespace google
3838

39-
#endif // GOOGLE_CLOUD_CPP_SPANNER_GOOGLE_CLOUD_SPANNER_COMMIT_RESULT_H
39+
#endif // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SPANNER_COMMIT_RESULT_H

‎google/cloud/spanner/connection.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
// See the License for the specific language governing permissions and
1313
// limitations under the License.
1414

15-
#ifndef GOOGLE_CLOUD_CPP_SPANNER_GOOGLE_CLOUD_SPANNER_CONNECTION_H
16-
#define GOOGLE_CLOUD_CPP_SPANNER_GOOGLE_CLOUD_SPANNER_CONNECTION_H
15+
#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SPANNER_CONNECTION_H
16+
#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SPANNER_CONNECTION_H
1717

1818
#include "google/cloud/spanner/batch_dml_result.h"
1919
#include "google/cloud/spanner/commit_result.h"
@@ -168,4 +168,4 @@ class Connection {
168168
} // namespace cloud
169169
} // namespace google
170170

171-
#endif // GOOGLE_CLOUD_CPP_SPANNER_GOOGLE_CLOUD_SPANNER_CONNECTION_H
171+
#endif // GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_SPANNER_CONNECTION_H

0 commit comments

Comments
 (0)