Changeset 54693


Ignore:
Timestamp:
Jul 5, 2009, 11:00:03 PM (9 years ago)
Author:
chris_kohlhoff
Message:

Merged revisions 54525-54526 from trunk.

........

r54525 | chris_kohlhoff | 2009-06-30 18:19:56 +1000 (Tue, 30 Jun 2009) | 2 lines


Don't rehash if the number of buckets hasn't changed.

........

r54526 | chris_kohlhoff | 2009-06-30 18:22:03 +1000 (Tue, 30 Jun 2009) | 2 lines


Check that WINVER is actually defined when using it.

........

Location:
branches/release
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • branches/release

  • branches/release/boost/asio/detail/hash_map.hpp

    r54499 r54693  
    216216  void rehash(std::size_t num_buckets)
    217217  {
     218    if (num_buckets == buckets_.size())
     219      return;
     220
    218221    iterator end = values_.end();
    219222
  • branches/release/boost/asio/detail/win_iocp_io_service.hpp

    r52309 r54693  
    133133    {
    134134      DWORD bytes_transferred = 0;
    135 #if (WINVER < 0x0500)
     135#if defined(WINVER) && (WINVER < 0x0500)
    136136      DWORD completion_key = 0;
    137137#else
     
    420420      // Get the next operation from the queue.
    421421      DWORD bytes_transferred = 0;
    422 #if (WINVER < 0x0500)
     422#if defined(WINVER) && (WINVER < 0x0500)
    423423      DWORD completion_key = 0;
    424424#else
  • branches/release/boost/asio/detail/win_thread.hpp

    r49221 r54693  
    4141unsigned int __stdcall win_thread_function(void* arg);
    4242
    43 #if (WINVER < 0x0500)
     43#if defined(WINVER) && (WINVER < 0x0500)
    4444void __stdcall apc_function(ULONG data);
    4545#else
     
    157157  friend unsigned int __stdcall win_thread_function(void* arg);
    158158
    159 #if (WINVER < 0x0500)
     159#if defined(WINVER) && (WINVER < 0x0500)
    160160  friend void __stdcall apc_function(ULONG);
    161161#else
     
    218218}
    219219
    220 #if (WINVER < 0x0500)
     220#if defined(WINVER) && (WINVER < 0x0500)
    221221inline void __stdcall apc_function(ULONG) {}
    222222#else
Note: See TracChangeset for help on using the changeset viewer.