diff options
author | Konstantin Käfer <mail@kkaefer.com> | 2016-05-25 21:14:18 +0200 |
---|---|---|
committer | Konstantin Käfer <mail@kkaefer.com> | 2016-05-25 21:35:37 +0200 |
commit | e2bcea90fce8a1e05e517c615d21d845e955f53d (patch) | |
tree | 208da7ad0db235a13b5ae6d360279a624e46fb95 /test/src | |
parent | 6368403f433cfbfed1547d4167a9836fa2942a97 (diff) | |
download | qtlocation-mapboxgl-e2bcea90fce8a1e05e517c615d21d845e955f53d.tar.gz |
[core] use #pragma once instead of ifdef include guards
Diffstat (limited to 'test/src')
-rw-r--r-- | test/src/mbgl/test/fixture_log_observer.hpp | 5 | ||||
-rw-r--r-- | test/src/mbgl/test/stub_file_source.hpp | 7 | ||||
-rw-r--r-- | test/src/mbgl/test/stub_style_observer.hpp | 5 | ||||
-rw-r--r-- | test/src/mbgl/test/util.hpp | 5 |
4 files changed, 5 insertions, 17 deletions
diff --git a/test/src/mbgl/test/fixture_log_observer.hpp b/test/src/mbgl/test/fixture_log_observer.hpp index f2ccb5cb58..1eabe10095 100644 --- a/test/src/mbgl/test/fixture_log_observer.hpp +++ b/test/src/mbgl/test/fixture_log_observer.hpp @@ -1,5 +1,4 @@ -#ifndef MBGL_TEST_FIXTURE_LOG_OBSERVER -#define MBGL_TEST_FIXTURE_LOG_OBSERVER +#pragma once #include <mbgl/platform/log.hpp> @@ -67,5 +66,3 @@ private: using FixtureLogObserver = FixtureLog::Observer; } // namespace mbgl - -#endif diff --git a/test/src/mbgl/test/stub_file_source.hpp b/test/src/mbgl/test/stub_file_source.hpp index 477f72ed42..b88fb59907 100644 --- a/test/src/mbgl/test/stub_file_source.hpp +++ b/test/src/mbgl/test/stub_file_source.hpp @@ -1,5 +1,4 @@ -#ifndef TEST_RESOURCES_STUB_FILE_SOURCE -#define TEST_RESOURCES_STUB_FILE_SOURCE +#pragma once #include <mbgl/storage/file_source.hpp> #include <mbgl/util/timer.hpp> @@ -40,6 +39,4 @@ private: util::Timer timer; }; -} - -#endif +} // namespace mbgl diff --git a/test/src/mbgl/test/stub_style_observer.hpp b/test/src/mbgl/test/stub_style_observer.hpp index a0d03de8a8..45af1edf9d 100644 --- a/test/src/mbgl/test/stub_style_observer.hpp +++ b/test/src/mbgl/test/stub_style_observer.hpp @@ -1,5 +1,4 @@ -#ifndef MBGL_TEST_STUB_STYLE_OBSERVER -#define MBGL_TEST_STUB_STYLE_OBSERVER +#pragma once #include <mbgl/style/style_observer.hpp> @@ -64,5 +63,3 @@ public: }; } // namespace mbgl - -#endif diff --git a/test/src/mbgl/test/util.hpp b/test/src/mbgl/test/util.hpp index f778679cb8..76c00d8434 100644 --- a/test/src/mbgl/test/util.hpp +++ b/test/src/mbgl/test/util.hpp @@ -1,5 +1,4 @@ -#ifndef MBGL_TEST_UTIL -#define MBGL_TEST_UTIL +#pragma once #ifdef __APPLE__ #include <TargetConditionals.h> @@ -76,5 +75,3 @@ void checkImage(const std::string& base, } } - -#endif |