summaryrefslogtreecommitdiff
path: root/src/irrlicht_changes
diff options
context:
space:
mode:
authorLoïc Blot <nerzhul@users.noreply.github.com>2017-08-17 22:19:39 +0200
committerGitHub <noreply@github.com>2017-08-17 22:19:39 +0200
commit921151d97a2fb2238ab514324fb95e2732248b96 (patch)
tree0723ab1f2c4df22492b4c2221d2974020d4dfd3d /src/irrlicht_changes
parentc738d1eeabbbe9164a25f6b69bc7ec1a3b44b051 (diff)
downloadminetest-921151d97a2fb2238ab514324fb95e2732248b96.tar.gz
minetest-921151d97a2fb2238ab514324fb95e2732248b96.tar.bz2
minetest-921151d97a2fb2238ab514324fb95e2732248b96.zip
C++ modernize: Pragma once (#6264)
* Migrate cpp headers to pragma once
Diffstat (limited to 'src/irrlicht_changes')
-rw-r--r--src/irrlicht_changes/CGUITTFont.h5
-rw-r--r--src/irrlicht_changes/irrUString.h5
-rw-r--r--src/irrlicht_changes/static_text.h5
3 files changed, 3 insertions, 12 deletions
diff --git a/src/irrlicht_changes/CGUITTFont.h b/src/irrlicht_changes/CGUITTFont.h
index 7ce898369..43fc69287 100644
--- a/src/irrlicht_changes/CGUITTFont.h
+++ b/src/irrlicht_changes/CGUITTFont.h
@@ -29,8 +29,7 @@
john@suckerfreegames.com
*/
-#ifndef __C_GUI_TTFONT_H_INCLUDED__
-#define __C_GUI_TTFONT_H_INCLUDED__
+#pragma once
#include <irrlicht.h>
#include <ft2build.h>
@@ -390,5 +389,3 @@ namespace gui
} // end namespace gui
} // end namespace irr
-
-#endif // __C_GUI_TTFONT_H_INCLUDED__
diff --git a/src/irrlicht_changes/irrUString.h b/src/irrlicht_changes/irrUString.h
index 2472eda4d..aead68bab 100644
--- a/src/irrlicht_changes/irrUString.h
+++ b/src/irrlicht_changes/irrUString.h
@@ -28,8 +28,7 @@
john@suckerfreegames.com
*/
-#ifndef __IRR_USTRING_H_INCLUDED__
-#define __IRR_USTRING_H_INCLUDED__
+#pragma once
#if (__cplusplus > 199711L) || (_MSC_VER >= 1600) || defined(__GXX_EXPERIMENTAL_CXX0X__)
# define USTRING_CPP0X
@@ -3890,5 +3889,3 @@ class hash : public std::unary_function<core::ustring, size_t>
} // end namespace core
} // end namespace irr
-
-#endif
diff --git a/src/irrlicht_changes/static_text.h b/src/irrlicht_changes/static_text.h
index 408a12784..de7b47e76 100644
--- a/src/irrlicht_changes/static_text.h
+++ b/src/irrlicht_changes/static_text.h
@@ -4,8 +4,7 @@
// This file is part of the "Irrlicht Engine".
// For conditions of distribution and use, see copyright notice in irrlicht.h
-#ifndef __C_GUI_STATIC_TEXT_H_INCLUDED__
-#define __C_GUI_STATIC_TEXT_H_INCLUDED__
+#pragma once
#include "IrrCompileConfig.h"
#ifdef _IRR_COMPILE_WITH_GUI_
@@ -264,5 +263,3 @@ inline void setStaticText(irr::gui::IGUIStaticText *static_text, const wchar_t *
}
#endif // _IRR_COMPILE_WITH_GUI_
-
-#endif // C_GUI_STATIC_TEXT_H_INCLUDED