src/HashTable.h
changeset 132 d8379f5d5a1d
parent 86 32ad0523b309
child 195 c1ba166f3fc4
     1.1 --- a/src/HashTable.h	Sun Jul 29 18:02:13 2012 -0700
     1.2 +++ b/src/HashTable.h	Sun Jul 29 18:19:12 2012 -0700
     1.3 @@ -1,19 +1,20 @@
     1.4 -/*
     1.5 +/* vim: set ts=4 sw=4 tw=99 et:
     1.6 + *
     1.7   * Copyright (C) 2012 David Anderson
     1.8   *
     1.9 - * This file is part of JITCraft.
    1.10 + * This file is part of SourcePawn.
    1.11   *
    1.12 - * JITCraft is free software: you can redistribute it and/or modify it under
    1.13 + * SourcePawn is free software: you can redistribute it and/or modify it under
    1.14   * the terms of the GNU General Public License as published by the Free
    1.15   * Software Foundation, either version 3 of the License, or (at your option)
    1.16   * any later version.
    1.17   * 
    1.18 - * Foobar is distributed in the hope that it will be useful, but WITHOUT ANY
    1.19 + * SourcePawn is distributed in the hope that it will be useful, but WITHOUT ANY
    1.20   * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
    1.21   * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
    1.22   *
    1.23   * You should have received a copy of the GNU General Public License along with
    1.24 - * JITCraft. If not, see http://www.gnu.org/licenses/.
    1.25 + * SourcePawn. If not, see http://www.gnu.org/licenses/.
    1.26   */
    1.27  #ifndef _INCLUDE_KEIMA_HASHTABLE_H_
    1.28  #define _INCLUDE_KEIMA_HASHTABLE_H_
    1.29 @@ -191,7 +192,6 @@
    1.30      }
    1.31      
    1.32      bool grow() {
    1.33 -        assert(IsPowerOfTwo(kMaxCapacity));
    1.34          if (capacity_ >= kMaxCapacity) {
    1.35              this->reportAllocationOverflow();
    1.36              return false;
    1.37 @@ -339,10 +339,12 @@
    1.38      }
    1.39  
    1.40      bool init(uint32 capacity = 0) {
    1.41 -        if (capacity < kMinCapacity)
    1.42 +        if (capacity < kMinCapacity) {
    1.43              capacity = kMinCapacity;
    1.44 -        else if (capacity > kMaxCapacity)
    1.45 -            capacity = kMaxCapacity;
    1.46 +        } else if (capacity > kMaxCapacity) {
    1.47 +            this->reportAllocationOverflow();
    1.48 +            return false;
    1.49 +        }
    1.50  
    1.51          minCapacity_ = capacity;
    1.52