[core] use #pragma once instead of ifdef include guards

This commit is contained in:
Konstantin Käfer
2016-05-25 21:14:18 +02:00
parent 6368403f43
commit e2bcea90fc
206 changed files with 211 additions and 829 deletions

View File

@@ -18,10 +18,9 @@ shader_name, shader_type, extension = os.path.basename(input_file).split('.')
with open(input_file, "r") as f:
data = f.read()
content = """// NOTE: DO NOT CHANGE THIS FILE. IT IS AUTOMATICALLY GENERATED.
content = """#pragma once
#ifndef MBGL_SHADER_{NAME}_{TYPE}
#define MBGL_SHADER_{NAME}_{TYPE}
// NOTE: DO NOT CHANGE THIS FILE. IT IS AUTOMATICALLY GENERATED.
#include <mbgl/gl/gl.hpp>
@@ -38,8 +37,6 @@ constexpr const char* {type} = R"MBGL_SHADER(#version 120\n{data})MBGL_SHADER";
}} // namespace {name}
}} // namespace shaders
}} // namespace mbgl
#endif
""".format(
name = shader_name,
NAME = shader_name.upper(),

View File

@@ -44,8 +44,7 @@ else:
rev = DEFAULT_REV
header = """// NOTE: DO NOT CHANGE THIS FILE. IT IS AUTOMATICALLY GENERATED.
#ifndef MBGL_UTIL_VERSION
#define MBGL_UTIL_VERSION
#pragma once
#define MBGL_VERSION 0x{major:02x}{minor:02x}{patch:02x}
#define MBGL_VERSION_STRING "{major}.{minor}.{patch}"
@@ -62,10 +61,8 @@ extern const char *revision;
extern const char *string;
extern const unsigned int number;
}}
}}
#endif
}} // namespace mbgl
}} // namespace version
""".format(
major = tag[0],
minor = tag[1],