10000 Fix use of broken bitset implementation in g++ · ChaiScript/ChaiScript@40b1549 · GitHub
[go: up one dir, main page]
Skip to content

Commit 40b1549

Browse files
lefticuslefticus
committed
Fix use of broken bitset implementation in g++
1 parent c9a5bf6 commit 40b1549

File tree

1 file changed

+7
-8
lines changed

1 file changed

+7
-8
lines changed

‎include/chaiscript/dispatchkit/type_info.hpp

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
#include <type_traits>
1212
#include <typeinfo>
1313
#include <string>
14-
#include <bitset>
1514

1615
namespace chaiscript
1716
{
@@ -84,12 +83,12 @@ namespace chaiscript
8483
&& (*m_bare_type_info) == ti;
8584
}
8685

87-
CHAISCRIPT_CONSTEXPR bool is_const() const CHAISCRIPT_NOEXCEPT { return m_flags[is_const_flag]; }
88-
CHAISCRIPT_CONSTEXPR bool is_reference() const CHAISCRIPT_NOEXCEPT { return m_flags[is_reference_flag]; }
89-
CHAISCRIPT_CONSTEXPR bool is_void() const CHAISCRIPT_NOEXCEPT { return m_flags[is_void_flag]; }
90-
CHAISCRIPT_CONSTEXPR bool is_arithmetic() const CHAISCRIPT_NOEXCEPT { return m_flags[is_arithmetic_flag]; }
91-
CHAISCRIPT_CONSTEXPR bool is_undef() const CHAISCRIPT_NOEXCEPT { return m_flags[is_undef_flag]; }
92-
CHAISCRIPT_CONSTEXPR bool is_pointer() const CHAISCRIPT_NOEXCEPT { return m_flags[is_pointer_flag]; }
86+
CHAISCRIPT_CONSTEXPR bool is_const() const CHAISCRIPT_NOEXCEPT { return m_flags & (1 << is_const_flag); }
87+
CHAISCRIPT_CONSTEXPR bool is_reference() const CHAISCRIPT_NOEXCEPT { return m_flags & (1 << is_reference_flag); }
88+
CHAISCRIPT_CONSTEXPR bool is_void() const CHAISCRIPT_NOEXCEPT { return m_flags & (1 << is_void_flag); }
89+
CHAISCRIPT_CONSTEXPR bool is_arithmetic() const CHAISCRIPT_NOEXCEPT { return m_flags & (1 << is_arithmetic_flag); }
90+
CHAISCRIPT_CONSTEXPR bool is_undef() const CHAISCRIPT_NOEXCEPT { return m_flags & (1 << is_undef_flag); }
91+
CHAISCRIPT_CONSTEXPR bool is_pointer() const CHAISCRIPT_NOEXCEPT { return m_flags & (1 << is_pointer_flag); }
9392

9493
std::string name() const
9594
{
@@ -119,7 +118,7 @@ namespace chaiscript
119118
private:
120119
const std::type_info *m_type_info;
121120
const std::type_info *m_bare_type_info;
122-
std::bitset<6> m_flags;
121+
unsigned int m_flags;
123122
static const int is_const_flag = 0;
124123
static const int is_reference_flag = 1;
125124
static const int is_pointer_flag = 2;

0 commit comments

Comments
 (0)
0