-
-
Save sithhell/d59c49ab73e8f94a06d8265d30b14139 to your computer and use it in GitHub Desktop.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/src/util/thread_allocator.cpp b/src/util/thread_allocator.cpp | |
index ffb97a5..6768ea2 100644 | |
--- a/src/util/thread_allocator.cpp | |
+++ b/src/util/thread_allocator.cpp | |
@@ -23,7 +23,7 @@ namespace hpx { namespace util | |
/////////////////////////////////////////////////////////////////////////// | |
HPX_CONSTEXPR std::size_t NUM_CHAINS = 12; | |
HPX_CONSTEXPR std::size_t BLOCK_ALIGNMENT = 8; | |
- HPX_CONSTEXPR std::size_t PENDING_THRESHOLD = 100; | |
+ HPX_CONSTEXPR long PENDING_THRESHOLD = 100; | |
HPX_CONSTEXPR std::size_t PAGE_SIZE = 16384; | |
HPX_CONSTEXPR std::int16_t MAX_BLOCK_SIZE = 640; | |
@@ -192,7 +192,7 @@ namespace hpx { namespace util | |
, next_free(nullptr) | |
{} | |
- HPX_CONSTEXPR alloc_block* next(std::size_t block_size) noexcept | |
+ alloc_block* next(std::size_t block_size) noexcept | |
{ | |
return reinterpret_cast<detail::alloc_block*>( | |
reinterpret_cast<char*>(this) + block_size); | |
@@ -266,12 +266,12 @@ namespace hpx { namespace util | |
alloc_page(alloc_page &&) = delete; | |
alloc_page& operator=(alloc_page &&) = delete; | |
- HPX_CONSTEXPR HPX_FORCEINLINE alloc_block* get() noexcept | |
+ HPX_FORCEINLINE alloc_block* get() noexcept | |
{ | |
return reinterpret_cast<alloc_block*>(&data); | |
} | |
- HPX_CONSTEXPR HPX_FORCEINLINE alloc_block const* get() const | |
+ HPX_FORCEINLINE alloc_block const* get() const | |
noexcept | |
{ | |
return reinterpret_cast<alloc_block const*>(&data); |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment