Explorar el Código

处置宏max导致编译失败

tags/v2.9.7
tearshark hace 4 años
padre
commit
872414d845
Se han modificado 2 ficheros con 4 adiciones y 4 borrados
  1. 2
    2
      librf/src/generator.h
  2. 2
    2
      librf/src/promise.h

+ 2
- 2
librf/src/generator.h Ver fichero

@@ -173,7 +173,7 @@ namespace resumef
void* operator new(size_t _Size)
{
size_t _State_size = _Align_size<state_type>();
assert(_Size >= sizeof(uint32_t) && _Size < std::numeric_limits<uint32_t>::max() - sizeof(_State_size));
assert(_Size >= sizeof(uint32_t) && _Size < (std::numeric_limits<uint32_t>::max)() - sizeof(_State_size));
#if RESUMEF_DEBUG_COUNTER
std::cout << "generator_promise::new, size=" << (_Size + _State_size) << std::endl;
#endif
@@ -186,7 +186,7 @@ namespace resumef
void operator delete(void* _Ptr, size_t _Size)
{
size_t _State_size = _Align_size<state_type>();
assert(_Size >= sizeof(uint32_t) && _Size < std::numeric_limits<uint32_t>::max() - sizeof(_State_size));
assert(_Size >= sizeof(uint32_t) && _Size < (std::numeric_limits<uint32_t>::max)() - sizeof(_State_size));
*reinterpret_cast<uint32_t*>(_Ptr) = static_cast<uint32_t>(_Size + _State_size);

+ 2
- 2
librf/src/promise.h Ver fichero

@@ -46,7 +46,7 @@ namespace resumef
void* operator new(size_t _Size)
{
size_t _State_size = _Align_size<state_type>();
assert(_Size >= sizeof(uint32_t) && _Size < std::numeric_limits<uint32_t>::max() - sizeof(_State_size));
assert(_Size >= sizeof(uint32_t) && _Size < (std::numeric_limits<uint32_t>::max)() - sizeof(_State_size));
#if RESUMEF_DEBUG_COUNTER
std::cout << "future_promise::new, size=" << (_Size + _State_size) << std::endl;
#endif
@@ -59,7 +59,7 @@ namespace resumef
void operator delete(void* _Ptr, size_t _Size)
{
size_t _State_size = _Align_size<state_type>();
assert(_Size >= sizeof(uint32_t) && _Size < std::numeric_limits<uint32_t>::max() - sizeof(_State_size));
assert(_Size >= sizeof(uint32_t) && _Size < (std::numeric_limits<uint32_t>::max)() - sizeof(_State_size));

_Alloc_char _Al;
state_type* st = reinterpret_cast<state_type*>(static_cast<char*>(_Ptr) - _State_size);

Cargando…
Cancelar
Guardar