Skip to content

Commit

Permalink
Merge pull request #97 from Qudix/po3/dev+
Browse files Browse the repository at this point in the history
Remove boost
  • Loading branch information
powerof3 authored Jan 1, 2024
2 parents 23b4c49 + 3b7a36d commit b56b2dd
Show file tree
Hide file tree
Showing 7 changed files with 29 additions and 30 deletions.
14 changes: 11 additions & 3 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,12 @@
/build*
# dot folders
.vs/
.vscode/
.xmake/

# folders
build/
out/

# files
*.zip
CMakeUserPresets.json
/out*
/.vs*
3 changes: 0 additions & 3 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ if("${PROJECT_SOURCE_DIR}" STREQUAL "${PROJECT_BINARY_DIR}")
endif()

find_package(binary_io REQUIRED CONFIG)
find_package(Boost MODULE REQUIRED)
find_package(spdlog REQUIRED CONFIG)

include(cmake/sourcelist.cmake)
Expand All @@ -38,7 +37,6 @@ add_library("${PROJECT_NAME}::${PROJECT_NAME}" ALIAS "${PROJECT_NAME}")
target_compile_definitions(
"${PROJECT_NAME}"
PUBLIC
BOOST_STL_INTERFACES_DISABLE_CONCEPTS
WINVER=0x0601 # windows 7, minimum supported version by skyrim special edition
_WIN32_WINNT=0x0601
"$<$<BOOL:${SKSE_SUPPORT_XBYAK}>:SKSE_SUPPORT_XBYAK=1>"
Expand Down Expand Up @@ -95,7 +93,6 @@ target_link_libraries(
"${PROJECT_NAME}"
PUBLIC
binary_io::binary_io
Boost::headers
spdlog::spdlog
Version.lib
)
Expand Down
2 changes: 0 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,6 @@


## Build Dependencies
* [Boost](https://www.boost.org/)
* Stl_interfaces
* [spdlog](https://github.com/gabime/spdlog)
* [Visual Studio Community 2019 16.10.0 Preview 3.0](https://visualstudio.microsoft.com/vs/preview/)
* Desktop development with C++
Expand Down
1 change: 0 additions & 1 deletion cmake/config.cmake.in
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,4 @@ include("${CMAKE_CURRENT_LIST_DIR}/@[email protected]")
include(CMakeFindDependencyMacro)

find_dependency(binary_io CONFIG)
find_dependency(Boost MODULE)
find_dependency(spdlog CONFIG)
37 changes: 18 additions & 19 deletions include/RE/B/BSTHashMap.h
Original file line number Diff line number Diff line change
Expand Up @@ -113,25 +113,14 @@ namespace RE
};

template <class U>
class iterator_base :
public boost::stl_interfaces::iterator_interface<
iterator_base<U>,
std::forward_iterator_tag,
U>
class iterator_base
{
private:
using super =
boost::stl_interfaces::iterator_interface<
iterator_base<U>,
std::forward_iterator_tag,
U>;

public:
using difference_type = typename super::difference_type;
using value_type = typename super::value_type;
using pointer = typename super::pointer;
using reference = typename super::reference;
using iterator_category = typename super::iterator_category;
using difference_type = std::ptrdiff_t;
using value_type = std::remove_const_t<U>;
using pointer = value_type*;
using reference = value_type&;
using iterator_category = std::forward_iterator_tag;

iterator_base() = default;
~iterator_base() = default;
Expand Down Expand Up @@ -176,7 +165,17 @@ namespace RE
return *this;
}

using super::operator++;
iterator_base operator++(int) noexcept
{
iterator_base result = *this;
++result;
return result;
}

[[nodiscard]] pointer operator->() const noexcept
{
return &**this;
}

protected:
friend class BSTScatterTable;
Expand Down Expand Up @@ -740,7 +739,7 @@ namespace RE
namespace detail
{
using _dummy_bsthashmap = BSTHashMap<int, int>;
BOOST_STL_INTERFACES_STATIC_ASSERT_CONCEPT(_dummy_bsthashmap::iterator, std::forward_iterator);
static_assert(std::forward_iterator<_dummy_bsthashmap::iterator>);
}

template <
Expand Down
1 change: 0 additions & 1 deletion include/SKSE/Impl/PCH.h
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,6 @@ static_assert(

#pragma warning(push)
#include <binary_io/file_stream.hpp>
#include <boost/stl_interfaces/iterator_interface.hpp>
#include <fmt/format.h>
#include <spdlog/spdlog.h>
#pragma warning(pop)
Expand Down
1 change: 0 additions & 1 deletion vcpkg.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
"license": "MIT",
"supports": "windows & x64",
"dependencies": [
"boost-stl-interfaces",
"fmt",
"rsm-binary-io",
"spdlog"
Expand Down

0 comments on commit b56b2dd

Please sign in to comment.