Author: rsmith
Date: Fri Oct 9 14:57:37 2015
New Revision: 249890
URL: http://llvm.org/viewvc/llvm-project?rev=249890&view=rev
Log:
Split <wctype.h> out of <cwctype>.
Added:
libcxx/trunk/include/wctype.h
- copied, changed from r249736, libcxx/trunk/include/cwctype
Modified:
libcxx/trunk/include/cwctype
Modified: libcxx/trunk/include/cwctype
URL:
http://llvm.org/viewvc/llvm-project/libcxx/trunk/include/cwctype?rev=249890&r1=249889&r2=249890&view=diff
==============================================================================
--- libcxx/trunk/include/cwctype (original)
+++ libcxx/trunk/include/cwctype Fri Oct 9 14:57:37 2015
@@ -63,41 +63,23 @@ _LIBCPP_BEGIN_NAMESPACE_STD
using ::wint_t;
using ::wctrans_t;
using ::wctype_t;
-#undef iswalnum
using ::iswalnum;
-#undef iswalpha
using ::iswalpha;
-#undef iswblank
using ::iswblank;
-#undef iswcntrl
using ::iswcntrl;
-#undef iswdigit
using ::iswdigit;
-#undef iswgraph
using ::iswgraph;
-#undef iswlower
using ::iswlower;
-#undef iswprint
using ::iswprint;
-#undef iswpunct
using ::iswpunct;
-#undef iswspace
using ::iswspace;
-#undef iswupper
using ::iswupper;
-#undef iswxdigit
using ::iswxdigit;
-#undef iswctype
using ::iswctype;
-#undef wctype
using ::wctype;
-#undef towlower
using ::towlower;
-#undef towupper
using ::towupper;
-#undef towctrans
using ::towctrans;
-#undef wctrans
using ::wctrans;
_LIBCPP_END_NAMESPACE_STD
Copied: libcxx/trunk/include/wctype.h (from r249736,
libcxx/trunk/include/cwctype)
URL:
http://llvm.org/viewvc/llvm-project/libcxx/trunk/include/wctype.h?p2=libcxx/trunk/include/wctype.h&p1=libcxx/trunk/include/cwctype&r1=249736&r2=249890&rev=249890&view=diff
==============================================================================
--- libcxx/trunk/include/cwctype (original)
+++ libcxx/trunk/include/wctype.h Fri Oct 9 14:57:37 2015
@@ -1,5 +1,5 @@
// -*- C++ -*-
-//===--------------------------- cwctype
----------------------------------===//
+//===--------------------------- wctype.h
---------------------------------===//
//
// The LLVM Compiler Infrastructure
//
@@ -8,19 +8,16 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP_CWCTYPE
-#define _LIBCPP_CWCTYPE
+#ifndef _LIBCPP_WCTYPE_H
+#define _LIBCPP_WCTYPE_H
/*
- cwctype synopsis
+ wctype.h synopsis
Macros:
WEOF
-namespace std
-{
-
Types:
wint_t
@@ -46,60 +43,37 @@ wint_t towupper(wint_t wc);
wint_t towctrans(wint_t wc, wctrans_t desc);
wctrans_t wctrans(const char* property);
-} // std
-
*/
#include <__config>
-#include <cctype>
-#include <wctype.h>
#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
#pragma GCC system_header
#endif
-_LIBCPP_BEGIN_NAMESPACE_STD
+#include_next <wctype.h>
+
+#ifdef __cplusplus
-using ::wint_t;
-using ::wctrans_t;
-using ::wctype_t;
#undef iswalnum
-using ::iswalnum;
#undef iswalpha
-using ::iswalpha;
#undef iswblank
-using ::iswblank;
#undef iswcntrl
-using ::iswcntrl;
#undef iswdigit
-using ::iswdigit;
#undef iswgraph
-using ::iswgraph;
#undef iswlower
-using ::iswlower;
#undef iswprint
-using ::iswprint;
#undef iswpunct
-using ::iswpunct;
#undef iswspace
-using ::iswspace;
#undef iswupper
-using ::iswupper;
#undef iswxdigit
-using ::iswxdigit;
#undef iswctype
-using ::iswctype;
#undef wctype
-using ::wctype;
#undef towlower
-using ::towlower;
#undef towupper
-using ::towupper;
#undef towctrans
-using ::towctrans;
#undef wctrans
-using ::wctrans;
-_LIBCPP_END_NAMESPACE_STD
+#endif // __cplusplus
-#endif // _LIBCPP_CWCTYPE
+#endif // _LIBCPP_WCTYPE_H
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
