summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorKonstantin Käfer <mail@kkaefer.com>2016-05-25 21:14:18 +0200
committerKonstantin Käfer <mail@kkaefer.com>2016-05-25 21:35:37 +0200
commite2bcea90fce8a1e05e517c615d21d845e955f53d (patch)
tree208da7ad0db235a13b5ae6d360279a624e46fb95 /test
parent6368403f433cfbfed1547d4167a9836fa2942a97 (diff)
downloadqtlocation-mapboxgl-e2bcea90fce8a1e05e517c615d21d845e955f53d.tar.gz
[core] use #pragma once instead of ifdef include guards
Diffstat (limited to 'test')
-rw-r--r--test/algorithm/mock.hpp5
-rw-r--r--test/src/mbgl/test/fixture_log_observer.hpp5
-rw-r--r--test/src/mbgl/test/stub_file_source.hpp7
-rw-r--r--test/src/mbgl/test/stub_style_observer.hpp5
-rw-r--r--test/src/mbgl/test/util.hpp5
5 files changed, 6 insertions, 21 deletions
diff --git a/test/algorithm/mock.hpp b/test/algorithm/mock.hpp
index 89f51b15b8..0faddcac7e 100644
--- a/test/algorithm/mock.hpp
+++ b/test/algorithm/mock.hpp
@@ -1,5 +1,4 @@
-#ifndef MBGL_TEST_MOCK
-#define MBGL_TEST_MOCK
+#pragma once
#include <cstdint>
#include <string>
@@ -56,5 +55,3 @@ MockTileData* MockSource::createTileData(const mbgl::OverscaledTileID& tileID) {
// Replace the existing MockTileData object, if any.
return (dataTiles[tileID] = std::make_unique<MockTileData>()).get();
}
-
-#endif
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