From 774f3cdc9b2861f0ba2bf496a8528e41f0f578c3 Mon Sep 17 00:00:00 2001 From: kaelima Date: Wed, 30 May 2012 09:22:56 +0200 Subject: Fixed some merging errors, there could be more, but at least it compiles. --- src/server/shared/Packets/ByteBuffer.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/server/shared') diff --git a/src/server/shared/Packets/ByteBuffer.h b/src/server/shared/Packets/ByteBuffer.h index 24ca412d6f2..1e346760e30 100755 --- a/src/server/shared/Packets/ByteBuffer.h +++ b/src/server/shared/Packets/ByteBuffer.h @@ -416,14 +416,14 @@ class ByteBuffer uint8& operator[](size_t const pos) { if (pos >= size()) - throw ByteBufferException(false, pos, 1, size()); + throw ByteBufferPositionException(false, pos, 1, size()); return _storage[pos]; } uint8 const& operator[](size_t const pos) const { if (pos >= size()) - throw ByteBufferException(false, pos, 1, size()); + throw ByteBufferPositionException(false, pos, 1, size()); return _storage[pos]; } -- cgit v1.2.3