Skip to content

Commit 6382ec1

Browse files
committed
[libc++][NFC] Reorder includes in locale.cpp
Also, include <type_traits> unconditionally. There really isn't much of a benefit in skipping it when exceptions are disabled.
1 parent 517728f commit 6382ec1

File tree

1 file changed

+15
-14
lines changed

1 file changed

+15
-14
lines changed

libcxx/src/locale.cpp

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -12,28 +12,29 @@
1212
#define _LCONV_C99
1313
#endif
1414

15-
#include "string"
16-
#include "locale"
17-
#include "codecvt"
18-
#include "vector"
1915
#include "algorithm"
20-
#include "typeinfo"
21-
#ifndef _LIBCPP_NO_EXCEPTIONS
22-
# include "type_traits"
23-
#endif
2416
#include "clocale"
17+
#include "codecvt"
18+
#include "cstdio"
19+
#include "cstdlib"
2520
#include "cstring"
21+
#include "cwctype"
22+
#include "locale"
23+
#include "string"
24+
#include "type_traits"
25+
#include "typeinfo"
26+
#include "vector"
27+
2628
#if defined(_LIBCPP_MSVCRT)
27-
#define _CTYPE_DISABLE_MACROS
29+
# define _CTYPE_DISABLE_MACROS
2830
#endif
29-
#include "cwctype"
31+
3032
#if defined(_LIBCPP_MSVCRT) || defined(__MINGW32__)
31-
#include "__support/win32/locale_win32.h"
33+
# include "__support/win32/locale_win32.h"
3234
#elif !defined(__BIONIC__) && !defined(__NuttX__)
33-
#include <langinfo.h>
35+
# include <langinfo.h>
3436
#endif
35-
#include <stdlib.h>
36-
#include <stdio.h>
37+
3738
#include "include/atomic_support.h"
3839
#include "include/sso_allocator.h"
3940
#include "__undef_macros"

0 commit comments

Comments
 (0)