summaryrefslogtreecommitdiff
path: root/platform
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 /platform
parent6368403f433cfbfed1547d4167a9836fa2942a97 (diff)
downloadqtlocation-mapboxgl-e2bcea90fce8a1e05e517c615d21d845e955f53d.tar.gz
[core] use #pragma once instead of ifdef include guards
Diffstat (limited to 'platform')
-rw-r--r--platform/android/src/jni.hpp5
-rwxr-xr-xplatform/android/src/native_map_view.hpp5
-rw-r--r--platform/default/mbgl/storage/offline_database.hpp5
-rw-r--r--platform/ios/benchmark/locations.hpp5
4 files changed, 4 insertions, 16 deletions
diff --git a/platform/android/src/jni.hpp b/platform/android/src/jni.hpp
index c2f1f5481b..57f84f0ccc 100644
--- a/platform/android/src/jni.hpp
+++ b/platform/android/src/jni.hpp
@@ -1,5 +1,4 @@
-#ifndef MBGL_ANDROID_JNI
-#define MBGL_ANDROID_JNI
+#pragma once
#include <string>
@@ -26,5 +25,3 @@ extern void detach_jni_thread(JavaVM* vm, JNIEnv** env, bool detach);
}
}
-
-#endif
diff --git a/platform/android/src/native_map_view.hpp b/platform/android/src/native_map_view.hpp
index 5bae79ad9a..40cb012b0b 100755
--- a/platform/android/src/native_map_view.hpp
+++ b/platform/android/src/native_map_view.hpp
@@ -1,5 +1,4 @@
-#ifndef MBGL_ANDROID_NATIVE_MAP_VIEW
-#define MBGL_ANDROID_NATIVE_MAP_VIEW
+#pragma once
#include <mbgl/map/map.hpp>
#include <mbgl/map/view.hpp>
@@ -98,5 +97,3 @@ private:
};
}
}
-
-#endif
diff --git a/platform/default/mbgl/storage/offline_database.hpp b/platform/default/mbgl/storage/offline_database.hpp
index 06c44c80be..1706c6ba5a 100644
--- a/platform/default/mbgl/storage/offline_database.hpp
+++ b/platform/default/mbgl/storage/offline_database.hpp
@@ -1,5 +1,4 @@
-#ifndef MBGL_OFFLINE_DATABASE
-#define MBGL_OFFLINE_DATABASE
+#pragma once
#include <mbgl/storage/resource.hpp>
#include <mbgl/storage/offline.hpp>
@@ -111,5 +110,3 @@ private:
};
} // namespace mbgl
-
-#endif
diff --git a/platform/ios/benchmark/locations.hpp b/platform/ios/benchmark/locations.hpp
index 96f9c6025b..1ea65d6280 100644
--- a/platform/ios/benchmark/locations.hpp
+++ b/platform/ios/benchmark/locations.hpp
@@ -1,5 +1,4 @@
-#ifndef MBGL_BENCH_LOCATIONS
-#define MBGL_BENCH_LOCATIONS
+#pragma once
#include <vector>
#include <string>
@@ -19,5 +18,3 @@ extern const std::vector<Location> locations;
}
}
-
-#endif \ No newline at end of file