Skip to content
Merged
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
18 changes: 8 additions & 10 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
cmake_minimum_required(VERSION 3.23..3.30)
project("DeadDevBitmask" LANGUAGES CXX VERSION 1.0.0)
project("deaddev-bitmask" LANGUAGES CXX VERSION 1.0.0)
cmake_policy(SET CMP0135 NEW)

message(STATUS "${CMAKE_PROJECT_NAME} v${CMAKE_PROJECT_VERSION}")
Expand Down Expand Up @@ -27,18 +27,14 @@ add_library(deaddev::bitmask ALIAS bitmask)
if(DEADDEV_BITMASK_INSTALL)
include(GNUInstallDirs)
include(CMakePackageConfigHelpers)
install(TARGETS bitmask EXPORT ${PROJECT_NAME}Targets)
install(EXPORT ${PROJECT_NAME}Targets
install(TARGETS bitmask EXPORT ${PROJECT_NAME}-targets)
install(EXPORT ${PROJECT_NAME}-targets
NAMESPACE deaddev::
DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}")
configure_package_config_file(
cmake/DeadDevBitmaskConfig.cmake.in
"${PROJECT_BINARY_DIR}/${PROJECT_NAME}Config.cmake"
INSTALL_DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}"
)
install(FILES "${PROJECT_BINARY_DIR}/${PROJECT_NAME}Config.cmake"
DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}"
)
cmake/deaddev-bitmask-config.cmake.in
"${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}"
INSTALL_DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}")
install(DIRECTORY include/deaddev
DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
FILES_MATCHING
Expand Down Expand Up @@ -70,3 +66,5 @@ endif(DEADDEV_BITMASK_BUILD_TESTS)
if(DEADDEV_BITMASK_BUILD_EXAMPLES)
add_subdirectory(example)
endif(DEADDEV_BITMASK_BUILD_EXAMPLES)

find_package(deaddev-bitmask)
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
@PACKAGE_INIT@

include("${CMAKE_CURRENT_LIST_DIR}/@PROJECT_NAME@Targets.cmake")
include("${CMAKE_CURRENT_LIST_DIR}/@PROJECT_NAME@-targets.cmake")
check_required_components("@PROJECT_NAME@")
message(STATUS "Found @PROJECT_NAME@ v@PROJECT_VERSION@")
17 changes: 16 additions & 1 deletion include/deaddev/bitmask.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,7 @@ DEADDEV_CONSTEVAL auto calculate_all_flags(Args... args) -> T {
* @return T value with all bits are set to 1
*/
template <typename T> DEADDEV_CONSTEVAL auto calculate_all_flags() -> T {
return static_cast<T>((1 << (sizeof(T) * CHAR_BIT)) - 1);
return static_cast<T>((1ull << ((sizeof(T) * CHAR_BIT) - 1)) - 1); // patched
}

/**
Expand Down Expand Up @@ -562,6 +562,21 @@ DEADDEV_NODISCARD constexpr deaddev::bitmask<T> operator&(T left, T right) noexc
return deaddev::bitmask<T>(left) & right;
}

template <typename T, typename = ::std::enable_if<::deaddev::details::is_bitmask_v<T>>>
DEADDEV_NODISCARD constexpr deaddev::bitmask<T> operator^(T left, ::deaddev::bitmask<T> right) noexcept {
return right ^ left;
}

template <typename T, typename = ::std::enable_if<::deaddev::details::is_bitmask_v<T>>>
DEADDEV_NODISCARD constexpr deaddev::bitmask<T> operator|(T left, ::deaddev::bitmask<T> right) noexcept {
return right | left;
}

template <typename T, typename = ::std::enable_if<::deaddev::details::is_bitmask_v<T>>>
DEADDEV_NODISCARD constexpr deaddev::bitmask<T> operator&(T left, ::deaddev::bitmask<T> right) noexcept {
return right & left;
}

/**
* @brief Enable bitmask operations for enum
* @details defines `auto adl_bitmask_operations_check(T) ->
Expand Down