--- deliantra/server/common/utils.C 2017/01/19 21:51:43 1.105 +++ deliantra/server/common/utils.C 2018/11/17 23:40:00 1.108 @@ -1,6 +1,7 @@ /* * This file is part of Deliantra, the Roguelike Realtime MMORPG. * + * Copyright (©) 2017,2018 Marc Alexander Lehmann / the Deliantra team * Copyright (©) 2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016 Marc Alexander Lehmann / Robin Redeker / the Deliantra team * * Deliantra is free software: you can redistribute it and/or modify it under @@ -43,23 +44,6 @@ refcnt_base::refcnt_t refcnt_dummy; ssize_t slice_alloc; -#if !GCC_VERSION(3,4) -int least_significant_bit (uint32_t x) -{ - x &= -x; // this isolates the lowest bit - - int r = 0; - - if (x & 0xaaaaaaaa) r += 1; - if (x & 0xcccccccc) r += 2; - if (x & 0xf0f0f0f0) r += 4; - if (x & 0xff00ff00) r += 8; - if (x & 0xffff0000) r += 16; - - return r; -} -#endif - /******************************************************************************/ /* Checks a player-provided string which will become the msg property of @@ -132,7 +116,7 @@ } void * -salloc_ (int n) throw (std::bad_alloc) +salloc_ (int n) { void *ptr = g_slice_alloc (n); @@ -144,7 +128,7 @@ } void * -salloc_ (int n, void *src) throw (std::bad_alloc) +salloc_ (int n, void *src) { void *ptr = salloc_ (n);