Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Core: Change BitField internal value to uint64_t #1517

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+7 −7
Open

Core: Change BitField internal value to uint64_t #1517

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 4 additions & 4 deletions include/godot_cpp/core/binder_common.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,17 +68,17 @@ namespace godot {
template <> \
struct VariantCaster<BitField<m_enum>> { \
static _FORCE_INLINE_ BitField<m_enum> cast(const Variant &p_variant) { \
return BitField<m_enum>(p_variant.operator int64_t()); \
return BitField<m_enum>(p_variant.operator uint64_t()); \
} \
}; \
template <> \
struct PtrToArg<BitField<m_enum>> { \
_FORCE_INLINE_ static BitField<m_enum> convert(const void *p_ptr) { \
return BitField<m_enum>(*reinterpret_cast<const int64_t *>(p_ptr)); \
return BitField<m_enum>(*reinterpret_cast<const uint64_t *>(p_ptr)); \
} \
typedef int64_t EncodeT; \
typedef uint64_t EncodeT; \
_FORCE_INLINE_ static void encode(BitField<m_enum> p_val, void *p_ptr) { \
*reinterpret_cast<int64_t *>(p_ptr) = p_val; \
*reinterpret_cast<uint64_t *>(p_ptr) = p_val; \
} \
}; \
}
Expand Down
6 changes: 3 additions & 3 deletions include/godot_cpp/core/type_info.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -260,14 +260,14 @@ inline StringName _gde_constant_get_enum_name(T param, StringName p_constant) {

template <typename T>
class BitField {
int64_t value = 0;
uint64_t value = 0;

public:
_FORCE_INLINE_ void set_flag(T p_flag) { value |= p_flag; }
_FORCE_INLINE_ bool has_flag(T p_flag) const { return value & p_flag; }
_FORCE_INLINE_ void clear_flag(T p_flag) { value &= ~p_flag; }
_FORCE_INLINE_ BitField(int64_t p_value) { value = p_value; }
_FORCE_INLINE_ operator int64_t() const { return value; }
_FORCE_INLINE_ BitField(uint64_t p_value) { value = p_value; }
_FORCE_INLINE_ operator uint64_t() const { return value; }
_FORCE_INLINE_ operator Variant() const { return value; }
};

Expand Down
Loading