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

add android umap and set; bunch of gnustl headers #1084

Merged
merged 2 commits into from
Sep 16, 2024
Merged

add android umap and set; bunch of gnustl headers #1084

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4a05074
add android umap and set; bunch of gnustl headers
dankmeme01 Sep 15, 2024
56da334
slight change
dankmeme01 Sep 16, 2024
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
14 changes: 10 additions & 4 deletions loader/include/Geode/c++stl/gnustl.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,12 @@ namespace geode::base {
#if defined(GEODE_IS_ANDROID)

#include "gnustl-map.hpp"
#include "gnustl/unordered_map.hpp"
#include "gnustl/unordered_set.hpp"
#include "gnustl/hash_specialization.hpp"
#undef _GLIBCXX_RELEASE
#undef __GLIBCXX__
#undef _GLIBCXX_USE_DUAL_ABI

namespace gd {
using namespace geode::stl;
Expand Down Expand Up @@ -686,11 +692,11 @@ namespace gd {
template <class V>
using set = void*[6];

template <class K, class V>
using unordered_map = void*[7];
template <class Key, class Tp, class Hash = geode::stl::hash<Key>, class Pred = geode::stl::equal_to<Key>, class Alloc = std::allocator<std::pair<const Key, Tp>>>
using unordered_map = geode::stl::unordered_map<Key, Tp, Hash, Pred, Alloc>;

template <class V>
using unordered_set = void*[7];
template <class Value, class Hash = geode::stl::hash<Value>, class Pred = geode::stl::equal_to<Value>, class Alloc = std::allocator<Value>>
using unordered_set = geode::stl::unordered_set<Value, Hash, Pred, Alloc>;
};

#elif defined(GEODE_IS_IOS)
Expand Down
Loading