This is an archive of the discontinued LLVM Phabricator instance.

Differential D138212

[libc++] Use numeric_limits instead of raw INT_MAX
ClosedPublic

Authored by ldionne on Nov 17 2022, 7:33 AM.

Details

Reviewers
philnik
Group Reviewers
Restricted Project
Commits
rGeaa4f041f786: [libc++] Use numeric_limits instead of raw INT_MAX
Summary

This allows discard_block_engine to work on platforms that might not
provide a full <limits.h> header.

Diff Detail

Event Timeline

ldionne created this revision.Nov 17 2022, 7:33 AM
Herald added a project: Restricted Project. · View Herald TranscriptNov 17 2022, 7:33 AM
ldionne requested review of this revision.Nov 17 2022, 7:33 AM
Herald added a project: Restricted Project. · View Herald TranscriptNov 17 2022, 7:33 AM
Herald added a reviewer: Restricted Project. · View Herald Transcript
Herald added a subscriber: libcxx-commits. · View Herald Transcript
philnik accepted this revision.Nov 17 2022, 7:52 AM
This revision is now accepted and ready to land.Nov 17 2022, 7:52 AM
Harbormaster completed remote builds in B198212: Diff 476126.Nov 17 2022, 7:59 AM
ldionne updated this revision to Diff 476174.Nov 17 2022, 10:27 AM

Fix CI

Harbormaster completed remote builds in B198247: Diff 476174.Nov 17 2022, 10:52 AM
ldionne updated this revision to Diff 476437.Nov 18 2022, 5:22 AM

Disable static_assert in C++03.

Harbormaster completed remote builds in B198444: Diff 476437.Nov 18 2022, 7:01 AM
Closed by commit rGeaa4f041f786: [libc++] Use numeric_limits instead of raw INT_MAX (authored by ldionne). · Explain WhyNov 18 2022, 8:32 AM
This revision was automatically updated to reflect the committed changes.
ldionne added a commit: rGeaa4f041f786: [libc++] Use numeric_limits instead of raw INT_MAX.

Revision Contents

PathSize
libcxx/
include/
__random/
6 lines
1 line
test/
libcxx/
transitive_includes/
1 line

Diff 476492

libcxx/include/__random/discard_block_engine.h

//===----------------------------------------------------------------------===// //===----------------------------------------------------------------------===//
// //
// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
// See https://llvm.org/LICENSE.txt for license information. // See https://llvm.org/LICENSE.txt for license information.
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
// //
//===----------------------------------------------------------------------===// //===----------------------------------------------------------------------===//
#ifndef _LIBCPP___RANDOM_DISCARD_BLOCK_ENGINE_H #ifndef _LIBCPP___RANDOM_DISCARD_BLOCK_ENGINE_H
#define _LIBCPP___RANDOM_DISCARD_BLOCK_ENGINE_H #define _LIBCPP___RANDOM_DISCARD_BLOCK_ENGINE_H
#include <__config> #include <__config>
#include <__random/is_seed_sequence.h> #include <__random/is_seed_sequence.h>
#include <__utility/move.h> #include <__utility/move.h>
#include <climits>
#include <iosfwd> #include <iosfwd>
#include <limits>
#include <type_traits> #include <type_traits>
#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
# pragma GCC system_header # pragma GCC system_header
#endif #endif
_LIBCPP_PUSH_MACROS _LIBCPP_PUSH_MACROS
#include <__undef_macros> #include <__undef_macros>
_LIBCPP_BEGIN_NAMESPACE_STD _LIBCPP_BEGIN_NAMESPACE_STD
template<class _Engine, size_t __p, size_t __r> template<class _Engine, size_t __p, size_t __r>
class _LIBCPP_TEMPLATE_VIS discard_block_engine class _LIBCPP_TEMPLATE_VIS discard_block_engine
{ {
_Engine __e_; _Engine __e_;
int __n_; int __n_;
static_assert( 0 < __r, "discard_block_engine invalid parameters"); static_assert( 0 < __r, "discard_block_engine invalid parameters");
static_assert(__r <= __p, "discard_block_engine invalid parameters"); static_assert(__r <= __p, "discard_block_engine invalid parameters");
static_assert(__r <= INT_MAX, "discard_block_engine invalid parameters"); #ifndef _LIBCPP_CXX03_LANG // numeric_limits::max() is not constexpr in C++03
static_assert(__r <= numeric_limits<int>::max(), "discard_block_engine invalid parameters");
#endif
public: public:
// types // types
typedef typename _Engine::result_type result_type; typedef typename _Engine::result_type result_type;
// engine characteristics // engine characteristics
static _LIBCPP_CONSTEXPR const size_t block_size = __p; static _LIBCPP_CONSTEXPR const size_t block_size = __p;
static _LIBCPP_CONSTEXPR const size_t used_block = __r; static _LIBCPP_CONSTEXPR const size_t used_block = __r;
▲ Show 20 Lines • Show All 159 Lines • Show Last 20 Lines

libcxx/include/random

Show First 20 Lines • Show All 1,723 Lines • ▼ Show 20 Lines
#include <initializer_list> #include <initializer_list>
#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
# pragma GCC system_header # pragma GCC system_header
#endif #endif
#if !defined(_LIBCPP_REMOVE_TRANSITIVE_INCLUDES) && _LIBCPP_STD_VER <= 20 #if !defined(_LIBCPP_REMOVE_TRANSITIVE_INCLUDES) && _LIBCPP_STD_VER <= 20
# include <algorithm> # include <algorithm>
# include <climits>
# include <cmath> # include <cmath>
# include <concepts> # include <concepts>
# include <cstddef> # include <cstddef>
# include <cstdint> # include <cstdint>
# include <iosfwd> # include <iosfwd>
# include <limits> # include <limits>
# include <numeric> # include <numeric>
# include <string> # include <string>
# include <type_traits> # include <type_traits>
# include <vector> # include <vector>
#endif #endif
#endif // _LIBCPP_RANDOM #endif // _LIBCPP_RANDOM

libcxx/test/libcxx/transitive_includes/cxx2b.csv

Show First 20 Lines • Show All 496 Lines • ▼ Show 20 Lines
queue cstdlib queue cstdlib
queue deque queue deque
queue initializer_list queue initializer_list
queue limits queue limits
queue type_traits queue type_traits
queue vector queue vector
queue version queue version
random bit random bit
random climits
random cmath random cmath
random cstddef random cstddef
random cstdint random cstdint
random cstdlib random cstdlib
random initializer_list random initializer_list
random iosfwd random iosfwd
random limits random limits
random numeric random numeric
▲ Show 20 Lines • Show All 234 Lines • Show Last 20 Lines