@@ -58,21 +58,21 @@
 
 	memchunks_size = __memchunks_size + 1;
 
 	if (SIZE_MAX - __memchunks_size == 0 ||
 	    memchunks_size > SIZE_MAX / sizeof(void*))
-		[[OFOutOfRangeException newWithObject: self] raise];
+		@throw [OFOutOfRangeException newWithObject: self];
 	
 	if ((memchunks = realloc(__memchunks,
 	    memchunks_size * sizeof(void*))) == NULL)
-		[[OFNoMemException newWithObject: self
-					 andSize: memchunks_size] raise];
+		@throw [OFNoMemException newWithObject: self
+					       andSize: memchunks_size];
 
 	if ((ptr = malloc(size)) == NULL) {
 		free(memchunks);
-		[[OFNoMemException newWithObject: self
-					 andSize: size] raise];
+		@throw [OFNoMemException newWithObject: self
+					       andSize: size];
 	}
 
 	__memchunks = memchunks;
 	__memchunks[__memchunks_size] = ptr;
 	__memchunks_size = memchunks_size;
@@ -85,11 +85,11 @@
 {
 	if (nitems == 0 || size == 0)
 		return NULL;
 
 	if (nitems > SIZE_MAX / size)
-		[[OFOutOfRangeException newWithObject: self] raise];
+		@throw [OFOutOfRangeException newWithObject: self];
 
 	return [self getMemWithSize: nitems * size];
 }
 
 - (void*)resizeMem: (void*)ptr
@@ -108,20 +108,20 @@
 	iter = __memchunks + __memchunks_size;
 
 	while (iter-- > __memchunks) {
 		if (OF_UNLIKELY(*iter == ptr)) {
 			if (OF_UNLIKELY((ptr = realloc(ptr, size)) == NULL))
-				[[OFNoMemException newWithObject: self
-							 andSize: size] raise];
+				@throw [OFNoMemException newWithObject: self
+							       andSize: size];
 			
 			*iter = ptr;
 			return ptr;
 		}
 	}
 
-	[[OFMemNotPartOfObjException newWithObject: self
-					andPointer: ptr] raise];
+	@throw [OFMemNotPartOfObjException newWithObject: self
+					      andPointer: ptr];
 	return NULL;	/* never reached, but makes gcc happy */
 }
 
 - (void*)resizeMem: (void*)ptr
 	  toNItems: (size_t)nitems
@@ -137,11 +137,11 @@
 		[self freeMem: ptr];
 		return NULL;
 	}
 
 	if (nitems > SIZE_MAX / size)
-		[[OFOutOfRangeException newWithObject: self] raise];
+		@throw [OFOutOfRangeException newWithObject: self];
 
 	memsize = nitems * size;
 	return [self resizeMem: ptr
 			toSize: memsize];
 }
@@ -161,12 +161,12 @@
 			memchunks_size = __memchunks_size - 1;
 			last = __memchunks[memchunks_size];
 
 			if (OF_UNLIKELY(__memchunks_size == 0 ||
 			    memchunks_size > SIZE_MAX / sizeof(void*)))
-				[[OFOutOfRangeException newWithObject: self]
-				    raise];
+				@throw [OFOutOfRangeException
+				    newWithObject: self];
 
 			if (OF_UNLIKELY(memchunks_size == 0)) {
 				free(ptr);
 				free(__memchunks);
 
@@ -176,14 +176,13 @@
 				return self;
 			}
 
 			if (OF_UNLIKELY((memchunks = realloc(__memchunks,
 			    memchunks_size * sizeof(void*))) == NULL))
-				[[OFNoMemException newWithObject: self
-							 andSize:
-							     memchunks_size]
-				    raise];
+				@throw [OFNoMemException
+				    newWithObject: self
+					  andSize: memchunks_size];
 
 			free(ptr);
 			__memchunks = memchunks;
 			__memchunks[i] = last;
 			__memchunks_size = memchunks_size;
@@ -190,10 +189,10 @@
 
 			return self;
 		}
 	}
 
-	[[OFMemNotPartOfObjException newWithObject: self
-					andPointer: ptr] raise];
+	@throw [OFMemNotPartOfObjException newWithObject: self
+					      andPointer: ptr];
 	return self;	/* never reached, but makes gcc happy */
 }
 @end