external/firebird/c++17.patch

   1 --- src/common/DynamicStrings.cpp
   2 +++ src/common/DynamicStrings.cpp
   3 @@ -37,7 +37,7 @@
   4
   5  namespace Firebird {
   6
   7 -unsigned makeDynamicStrings(unsigned length, ISC_STATUS* const dst, const ISC_STATUS* const src) throw(BadAlloc)
   8 +unsigned makeDynamicStrings(unsigned length, ISC_STATUS* const dst, const ISC_STATUS* const src)
   9  {
  10         const ISC_STATUS* end = &src[length];
  11
  12 --- src/common/DynamicStrings.h
  13 +++ src/common/DynamicStrings.h
  14 @@ -34,7 +34,7 @@
  15
  16  namespace Firebird {
  17
  18 -unsigned makeDynamicStrings(unsigned len, ISC_STATUS* const dst, const ISC_STATUS* const src) throw(BadAlloc);
  19 +unsigned makeDynamicStrings(unsigned len, ISC_STATUS* const dst, const ISC_STATUS* const src);
  20  char* findDynamicStrings(unsigned len, ISC_STATUS* ptr) throw();
  21
  22  } // namespace Firebird
  23 --- src/common/StatusArg.cpp
  24 +++ src/common/StatusArg.cpp
  25 @@ -53,7 +53,7 @@
  26
  27  namespace Arg {
  28
  29 -Base::Base(ISC_STATUS k, ISC_STATUS c) throw(Firebird::BadAlloc) :
  30 +Base::Base(ISC_STATUS k, ISC_STATUS c) :
  31         implementation(FB_NEW_POOL(*getDefaultMemoryPool()) ImplBase(k, c))
  32  {
  33  }
  34 @@ -94,28 +94,28 @@
  35         assign(ex);
  36  }
  37
  38 -StatusVector::StatusVector(ISC_STATUS k, ISC_STATUS c) throw(Firebird::BadAlloc) :
  39 +StatusVector::StatusVector(ISC_STATUS k, ISC_STATUS c) :
  40         Base(FB_NEW_POOL(*getDefaultMemoryPool()) ImplStatusVector(k, c))
  41  {
  42         operator<<(*(static_cast<Base*>(this)));
  43  }
  44
  45 -StatusVector::StatusVector(const ISC_STATUS* s) throw(Firebird::BadAlloc) :
  46 +StatusVector::StatusVector(const ISC_STATUS* s) :
  47         Base(FB_NEW_POOL(*getDefaultMemoryPool()) ImplStatusVector(s))
  48  {
  49  }
  50
  51 -StatusVector::StatusVector(const IStatus* s) throw(Firebird::BadAlloc) :
  52 +StatusVector::StatusVector(const IStatus* s) :
  53         Base(FB_NEW_POOL(*getDefaultMemoryPool()) ImplStatusVector(s))
  54  {
  55  }
  56
  57 -StatusVector::StatusVector(const Exception& ex) throw(Firebird::BadAlloc) :
  58 +StatusVector::StatusVector(const Exception& ex) :
  59         Base(FB_NEW_POOL(*getDefaultMemoryPool()) ImplStatusVector(ex))
  60  {
  61  }
  62
  63 -StatusVector::StatusVector() throw(Firebird::BadAlloc) :
  64 +StatusVector::StatusVector() :
  65         Base(FB_NEW_POOL(*getDefaultMemoryPool()) ImplStatusVector(0, 0))
  66  {
  67  }
  68 --- src/common/StatusArg.h
  69 +++ src/common/StatusArg.h
  70 @@ -86,7 +86,7 @@
  71                 virtual ~ImplBase() { }
  72         };
  73
  74 -       Base(ISC_STATUS k, ISC_STATUS c) throw(Firebird::BadAlloc);
  75 +       Base(ISC_STATUS k, ISC_STATUS c);
  76         explicit Base(ImplBase* i) throw() : implementation(i) { }
  77         ~Base() throw() { delete implementation; }
  78
  79 @@ -142,13 +142,13 @@
  80                 explicit ImplStatusVector(const Exception& ex) throw();
  81         };
  82
  83 -       StatusVector(ISC_STATUS k, ISC_STATUS v) throw(Firebird::BadAlloc);
  84 +       StatusVector(ISC_STATUS k, ISC_STATUS v);
  85
  86  public:
  87 -       explicit StatusVector(const ISC_STATUS* s) throw(Firebird::BadAlloc);
  88 -       explicit StatusVector(const IStatus* s) throw(Firebird::BadAlloc);
  89 -       explicit StatusVector(const Exception& ex) throw(Firebird::BadAlloc);
  90 -       StatusVector() throw(Firebird::BadAlloc);
  91 +       explicit StatusVector(const ISC_STATUS* s);
  92 +       explicit StatusVector(const IStatus* s);
  93 +       explicit StatusVector(const Exception& ex);
  94 +       StatusVector();
  95         ~StatusVector() { }
  96
  97         const ISC_STATUS* value() const throw() { return implementation->value(); }
  98 --- src/common/classes/alloc.cpp
  99 +++ src/common/classes/alloc.cpp
 100 @@ -1431,7 +1431,7 @@
 101
 102         ~FreeObjects();
 103
 104 -       FreeObjPtr allocateBlock(MemPool* pool, size_t from, size_t& size) throw (OOM_EXCEPTION)
 105 +       FreeObjPtr allocateBlock(MemPool* pool, size_t from, size_t& size)
 106         {
 107                 size_t full_size = size + (from ? 0 : ListBuilder::MEM_OVERHEAD);
 108                 if (full_size > Limits::TOP_LIMIT)
 109 @@ -1498,7 +1498,7 @@
 110         ListBuilder listBuilder;
 111         Extent* currentExtent;
 112
 113 -       MemBlock* newBlock(MemPool* pool, unsigned slot) throw (OOM_EXCEPTION);
 114 +       MemBlock* newBlock(MemPool* pool, unsigned slot);
 115  };
 116
 117
 118 @@ -1538,26 +1538,26 @@
 119         AtomicCounter used_memory, mapped_memory;
 120
 121  private:
 122 -       MemBlock* alloc(size_t from, size_t& length, bool flagRedirect) throw (OOM_EXCEPTION);
 123 +       MemBlock* alloc(size_t from, size_t& length, bool flagRedirect);
 124         void releaseBlock(MemBlock *block) throw ();
 125
 126  public:
 127 -       void* allocate(size_t size ALLOC_PARAMS) throw (OOM_EXCEPTION);
 128 -       MemBlock* allocate2(size_t from, size_t& size ALLOC_PARAMS) throw (OOM_EXCEPTION);
 129 +       void* allocate(size_t size ALLOC_PARAMS);
 130 +       MemBlock* allocate2(size_t from, size_t& size ALLOC_PARAMS);
 131
 132  private:
 133 -       virtual void memoryIsExhausted(void) throw (OOM_EXCEPTION);
 134 -       void* allocRaw(size_t length) throw (OOM_EXCEPTION);
 135 +       virtual void memoryIsExhausted(void);
 136 +       void* allocRaw(size_t length);
 137         static void release(void* block, bool flagDecr) throw ();
 138         static void releaseRaw(bool destroying, void *block, size_t size, bool use_cache = true) throw ();
 139 -       void* getExtent(size_t from, size_t& to) throw (OOM_EXCEPTION);
 140 +       void* getExtent(size_t from, size_t& to);
 141
 142  public:
 143         static void releaseExtent(bool destroying, void *block, size_t size, MemPool* pool) throw ();
 144
 145         // pass desired size, return actual extent size
 146         template <class Extent>
 147 -       void newExtent(size_t& size, Extent** linkedList) throw (OOM_EXCEPTION);
 148 +       void newExtent(size_t& size, Extent** linkedList);
 149
 150  private:
 151  #ifdef USE_VALGRIND
 152 @@ -1667,7 +1667,7 @@
 153
 154
 155  template <class ListBuilder, class Limits>
 156 -MemBlock* FreeObjects<ListBuilder, Limits>::newBlock(MemPool* pool, unsigned slot) throw (OOM_EXCEPTION)
 157 +MemBlock* FreeObjects<ListBuilder, Limits>::newBlock(MemPool* pool, unsigned slot)
 158  {
 159         size_t size = Limits::getSize(slot);
 160
 161 @@ -1902,7 +1902,7 @@
 162  }
 163
 164  template <class Extent>
 165 -void MemPool::newExtent(size_t& size, Extent** linkedList) throw(OOM_EXCEPTION)
 166 +void MemPool::newExtent(size_t& size, Extent** linkedList)
 167  {
 168         // No large enough block found. We need to extend the pool
 169         void* memory = NULL;
 170 @@ -1967,7 +1967,7 @@
 171         pool->setStatsGroup(newStats);
 172  }
 173
 174 -MemBlock* MemPool::alloc(size_t from, size_t& length, bool flagRedirect) throw (OOM_EXCEPTION)
 175 +MemBlock* MemPool::alloc(size_t from, size_t& length, bool flagRedirect)
 176  {
 177         MutexEnsureUnlock guard(mutex, "MemPool::alloc");
 178         guard.enter();
 179 @@ -2026,7 +2026,7 @@
 180  #ifdef DEBUG_GDS_ALLOC
 181         , const char* fileName, int line
 182  #endif
 183 -) throw (OOM_EXCEPTION)
 184 +)
 185  {
 186         size_t length = from ? size : ROUNDUP(size + VALGRIND_REDZONE, roundingSize) + GUARD_BYTES;
 187         MemBlock* memory = alloc(from, length, true);
 188 @@ -2055,7 +2055,7 @@
 189  }
 190
 191
 192 -void* MemPool::allocate(size_t size ALLOC_PARAMS) throw (OOM_EXCEPTION)
 193 +void* MemPool::allocate(size_t size ALLOC_PARAMS)
 194  {
 195         MemBlock* memory = allocate2(0, size ALLOC_PASS_ARGS);
 196
 197 @@ -2180,12 +2180,12 @@
 198         releaseRaw(pool_destroying, hunk, hunk->length, false);
 199  }
 200
 201 -void MemPool::memoryIsExhausted(void) throw (OOM_EXCEPTION)
 202 +void MemPool::memoryIsExhausted(void)
 203  {
 204         Firebird::BadAlloc::raise();
 205  }
 206
 207 -void* MemPool::allocRaw(size_t size) throw (OOM_EXCEPTION)
 208 +void* MemPool::allocRaw(size_t size)
 209  {
 210  #ifndef USE_VALGRIND
 211         if (size == DEFAULT_ALLOCATION)
 212 @@ -2245,7 +2245,7 @@
 213  }
 214
 215
 216 -void* MemPool::getExtent(size_t from, size_t& to) throw(OOM_EXCEPTION)         // pass desired minimum size, return actual extent size
 217 +void* MemPool::getExtent(size_t from, size_t& to)                              // pass desired minimum size, return actual extent size
 218  {
 219         MemBlock* extent = allocate2(from, to ALLOC_ARGS);
 220         return &extent->body;
 221 @@ -2348,7 +2348,7 @@
 222         deallocate(block);
 223  }
 224
 225 -void* MemoryPool::calloc(size_t size ALLOC_PARAMS) throw (OOM_EXCEPTION)
 226 +void* MemoryPool::calloc(size_t size ALLOC_PARAMS)
 227  {
 228         void* block = allocate(size ALLOC_PASS_ARGS);
 229         memset(block, 0, size);
 230 @@ -2489,7 +2489,7 @@
 231         MemPool::globalFree(block);
 232  }
 233
 234 -void* MemoryPool::allocate(size_t size ALLOC_PARAMS) throw (OOM_EXCEPTION)
 235 +void* MemoryPool::allocate(size_t size ALLOC_PARAMS)
 236  {
 237         return pool->allocate(size ALLOC_PASS_ARGS);
 238  }
 239 @@ -2547,11 +2547,11 @@
 240  // in a case when we actually need "new" only with file/line information
 241  // this version should be also present as a pair for "delete".
 242  #ifdef DEBUG_GDS_ALLOC
 243 -void* operator new(size_t s) throw (OOM_EXCEPTION)
 244 +void* operator new(size_t s)
 245  {
 246         return MemoryPool::globalAlloc(s ALLOC_ARGS);
 247  }
 248 -void* operator new[](size_t s) throw (OOM_EXCEPTION)
 249 +void* operator new[](size_t s)
 250  {
 251         return MemoryPool::globalAlloc(s ALLOC_ARGS);
 252  }
 253 --- src/common/classes/alloc.h
 254 +++ src/common/classes/alloc.h
 255 @@ -186,18 +186,18 @@
 256  #define ALLOC_PASS_ARGS
 257  #endif // DEBUG_GDS_ALLOC
 258
 259 -       void* calloc(size_t size ALLOC_PARAMS) throw (OOM_EXCEPTION);
 260 +       void* calloc(size_t size ALLOC_PARAMS);
 261
 262  #ifdef LIBC_CALLS_NEW
 263         static void* globalAlloc(size_t s ALLOC_PARAMS) throw (OOM_EXCEPTION);
 264  #else
 265 -       static void* globalAlloc(size_t s ALLOC_PARAMS) throw (OOM_EXCEPTION)
 266 +       static void* globalAlloc(size_t s ALLOC_PARAMS)
 267         {
 268                 return defaultMemoryManager->allocate(s ALLOC_PASS_ARGS);
 269         }
 270  #endif // LIBC_CALLS_NEW
 271
 272 -       void* allocate(size_t size ALLOC_PARAMS) throw (OOM_EXCEPTION);
 273 +       void* allocate(size_t size ALLOC_PARAMS);
 274
 275         static void globalFree(void* mem) throw ();
 276         void deallocate(void* mem) throw ();
 277 @@ -295,20 +295,20 @@
 278
 279  // operators new and delete
 280
 281 -inline void* operator new(size_t s ALLOC_PARAMS) throw (OOM_EXCEPTION)
 282 +inline void* operator new(size_t s ALLOC_PARAMS)
 283  {
 284         return MemoryPool::globalAlloc(s ALLOC_PASS_ARGS);
 285  }
 286 -inline void* operator new[](size_t s ALLOC_PARAMS) throw (OOM_EXCEPTION)
 287 +inline void* operator new[](size_t s ALLOC_PARAMS)
 288  {
 289         return MemoryPool::globalAlloc(s ALLOC_PASS_ARGS);
 290  }
 291
 292 -inline void* operator new(size_t s, Firebird::MemoryPool& pool ALLOC_PARAMS) throw (OOM_EXCEPTION)
 293 +inline void* operator new(size_t s, Firebird::MemoryPool& pool ALLOC_PARAMS)
 294  {
 295         return pool.allocate(s ALLOC_PASS_ARGS);
 296  }
 297 -inline void* operator new[](size_t s, Firebird::MemoryPool& pool ALLOC_PARAMS) throw (OOM_EXCEPTION)
 298 +inline void* operator new[](size_t s, Firebird::MemoryPool& pool ALLOC_PARAMS)
 299  {
 300         return pool.allocate(s ALLOC_PASS_ARGS);
 301  }