Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion libcxx/include/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -1028,7 +1028,6 @@ set(files
filesystem
flat_map
flat_set
float.h
format
forward_list
fstream
Expand Down
14 changes: 6 additions & 8 deletions libcxx/include/__cxx03/cfloat
Original file line number Diff line number Diff line change
Expand Up @@ -71,14 +71,12 @@ Macros:

#include <__cxx03/__config>

#include <float.h>

#ifndef _LIBCPP_FLOAT_H
# error <cfloat> tried including <float.h> but didn't find libc++'s <float.h> header. \
This usually means that your header search paths are not configured properly. \
The header search paths should contain the C++ Standard Library headers before \
any C Standard Library, and you are probably using compiler flags that make that \
not be the case.
// <float.h> is not provided by libc++
#if __has_include(<float.h>)
# include <float.h>
# ifdef _LIBCPP_FLOAT_H
# error "If libc++ starts defining <float.h>, the __has_include check should move to libc++'s <float.h>"
# endif
#endif

#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
Expand Down
4 changes: 0 additions & 4 deletions libcxx/include/__cxx03/module.modulemap
Original file line number Diff line number Diff line change
Expand Up @@ -443,10 +443,6 @@ module cxx03_std_fenv_h [system] {
header "fenv.h"
export *
}
module cxx03_std_float_h [system] {
header "float.h"
export *
}
module cxx03_std_inttypes_h [system] {
header "inttypes.h"
export *
Expand Down
14 changes: 6 additions & 8 deletions libcxx/include/cfloat
Original file line number Diff line number Diff line change
Expand Up @@ -74,14 +74,12 @@ Macros:
#else
# include <__config>

# include <float.h>

# ifndef _LIBCPP_FLOAT_H
# error <cfloat> tried including <float.h> but didn't find libc++'s <float.h> header. \
This usually means that your header search paths are not configured properly. \
The header search paths should contain the C++ Standard Library headers before \
any C Standard Library, and you are probably using compiler flags that make that \
not be the case.
// <float.h> is not provided by libc++
# if __has_include(<float.h>)
# include <float.h>
# ifdef _LIBCPP_FLOAT_H
# error "If libc++ starts defining <float.h>, the __has_include check should move to libc++'s <float.h>"
# endif
# endif

# if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
Expand Down
99 changes: 0 additions & 99 deletions libcxx/include/float.h

This file was deleted.

4 changes: 0 additions & 4 deletions libcxx/include/module.modulemap.in
Original file line number Diff line number Diff line change
Expand Up @@ -2429,10 +2429,6 @@ module std_fenv_h [system] {
header "fenv.h"
export *
}
module std_float_h [system] {
header "float.h"
export *
}
module std_inttypes_h [system] {
header "inttypes.h"
export *
Expand Down
8 changes: 8 additions & 0 deletions libcxx/test/std/depr/depr.c.headers/float_h.compile.pass.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,10 @@
//===----------------------------------------------------------------------===//

// test <float.h>
//
// Even though <float.h> is not provided by libc++, we still test that using it
// with libc++ on the search path will work, and that it provides the necessary
// content.

#include <float.h>

Expand All @@ -16,9 +20,11 @@
#error FLT_ROUNDS not defined
#endif

#if TEST_STD_VER >= 11
#ifndef FLT_EVAL_METHOD
#error FLT_EVAL_METHOD not defined
#endif
#endif

#ifndef FLT_RADIX
#error FLT_RADIX not defined
Expand Down Expand Up @@ -50,9 +56,11 @@
#error LDBL_MANT_DIG not defined
#endif

#if TEST_STD_VER >= 11
#ifndef DECIMAL_DIG
#error DECIMAL_DIG not defined
#endif
#endif

#if TEST_STD_VER > 14
#ifndef FLT_DECIMAL_DIG
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,11 @@
#error FLT_ROUNDS not defined
#endif

#if TEST_STD_VER >= 11
#ifndef FLT_EVAL_METHOD
#error FLT_EVAL_METHOD not defined
#endif
#endif

#ifndef FLT_RADIX
#error FLT_RADIX not defined
Expand Down Expand Up @@ -50,9 +52,11 @@
#error LDBL_MANT_DIG not defined
#endif

#if TEST_STD_VER >= 11
#ifndef DECIMAL_DIG
#error DECIMAL_DIG not defined
#endif
#endif

#if TEST_STD_VER > 14
#ifndef FLT_DECIMAL_DIG
Expand Down