summaryrefslogtreecommitdiff
path: root/main/tests/test_string.cpp
diff options
context:
space:
mode:
authorRĂ©mi Verschelde <rverschelde@gmail.com>2020-02-07 14:19:32 +0100
committerGitHub <noreply@github.com>2020-02-07 14:19:32 +0100
commit7711e9f93bcb6bda690c03899b44762009e82547 (patch)
tree72c94797816a2f3da5ad4cb59a177ec74674a357 /main/tests/test_string.cpp
parent00f46452b0206afe6aca79b0c4cd4a205f99067b (diff)
parentf3726ee99488695c4aae22fffd3649499b285faf (diff)
Merge pull request #35963 from akien-mga/scons-modules-enabled-header
SCons: Refactor module defines into a generated header, cleanup
Diffstat (limited to 'main/tests/test_string.cpp')
-rw-r--r--main/tests/test_string.cpp14
1 files changed, 9 insertions, 5 deletions
diff --git a/main/tests/test_string.cpp b/main/tests/test_string.cpp
index 9e8c8706ff..eef3d9b84c 100644
--- a/main/tests/test_string.cpp
+++ b/main/tests/test_string.cpp
@@ -28,15 +28,19 @@
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/*************************************************************************/
-#include "core/ustring.h"
-#include <wchar.h>
-//#include "core/math/math_funcs.h"
+#include "test_string.h"
+
#include "core/io/ip_address.h"
#include "core/os/os.h"
+#include "core/ustring.h"
+
+#include "modules/modules_enabled.gen.h"
+#ifdef MODULE_REGEX_ENABLED
#include "modules/regex/regex.h"
-#include <stdio.h>
+#endif
-#include "test_string.h"
+#include <stdio.h>
+#include <wchar.h>
namespace TestString {