ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/include/util.h
(Generate patch)

Comparing deliantra/server/include/util.h (file contents):
Revision 1.97 by root, Fri Mar 26 01:04:44 2010 UTC vs.
Revision 1.101 by root, Wed Apr 28 19:49:50 2010 UTC

… …
55#endif 55#endif
56 56
57// use C0X decltype for auto declarations until ISO C++ sanctifies them (if ever) 57// use C0X decltype for auto declarations until ISO C++ sanctifies them (if ever)
58#define auto(var,expr) decltype(expr) var = (expr) 58#define auto(var,expr) decltype(expr) var = (expr)
59 59
60// could use the sizeof (arr) /( sizeof (arr [0]) here, but C++ is
61// much more obfuscated... :)
62
63template<typename T, int N>
64inline int array_length (const T (&arr)[N])
65{
66 return N;
67}
68
60// very ugly macro that basically declares and initialises a variable 69// very ugly macro that basically declares and initialises a variable
61// that is in scope for the next statement only 70// that is in scope for the next statement only
62// works only for stuff that can be assigned 0 and converts to false 71// works only for stuff that can be assigned 0 and converts to false
63// (note: works great for pointers) 72// (note: works great for pointers)
64// most ugly macro I ever wrote 73// most ugly macro I ever wrote
… …
98inline sint8 sign (sint8 v) { return 1 - (sint8 (uint8 (v) >> 7) * 2); } 107inline sint8 sign (sint8 v) { return 1 - (sint8 (uint8 (v) >> 7) * 2); }
99 108
100// sign0 returns -1, 0 or +1 109// sign0 returns -1, 0 or +1
101template<typename T> 110template<typename T>
102static inline T sign0 (T v) { return v ? sign (v) : 0; } 111static inline T sign0 (T v) { return v ? sign (v) : 0; }
112
113template<typename T, typename U>
114static inline T copysign (T a, U b) { return a > 0 ? b : -b; }
103 115
104// div* only work correctly for div > 0 116// div* only work correctly for div > 0
105// div, with correct rounding (< 0.5 downwards, >=0.5 upwards) 117// div, with correct rounding (< 0.5 downwards, >=0.5 upwards)
106template<typename T> static inline T div (T val, T div) 118template<typename T> static inline T div (T val, T div)
107{ 119{
… …
467 return !is_constant (num) ? get_range (num) // non-constant 479 return !is_constant (num) ? get_range (num) // non-constant
468 : num & (num - 1) ? (this->next () * (uint64_t)num) >> 32U // constant, non-power-of-two 480 : num & (num - 1) ? (this->next () * (uint64_t)num) >> 32U // constant, non-power-of-two
469 : this->next () & (num - 1); // constant, power-of-two 481 : this->next () & (num - 1); // constant, power-of-two
470 } 482 }
471 483
472 // return a number within (min .. max) 484 // return a number within the closed interval [min .. max]
473 int operator () (int r_min, int r_max) 485 int operator () (int r_min, int r_max)
474 { 486 {
475 return is_constant (r_min) && is_constant (r_max) && r_min <= r_max 487 return is_constant (r_min) && is_constant (r_max) && r_min <= r_max
476 ? r_min + operator ()(r_max - r_min + 1) 488 ? r_min + operator ()(r_max - r_min + 1)
477 : get_range (r_min, r_max); 489 : get_range (r_min, r_max);
478 } 490 }
479 491
492 // return a number within the closed interval [0..1]
480 double operator ()() 493 double operator ()()
481 { 494 {
482 return this->next () / (double)0xFFFFFFFFU; 495 return this->next () / (double)0xFFFFFFFFU;
483 } 496 }
484 497
… …
573 // FNV-1a is faster on many cpus because the multiplication 586 // FNV-1a is faster on many cpus because the multiplication
574 // runs concurrently with the looping logic. 587 // runs concurrently with the looping logic.
575 uint32_t hash = STRHSH_NULL; 588 uint32_t hash = STRHSH_NULL;
576 589
577 while (*s) 590 while (*s)
578 hash = (hash ^ *s++) * 16777619; 591 hash = (hash ^ *s++) * 16777619U;
579 592
580 return hash; 593 return hash;
581} 594}
582 595
583static inline uint32_t 596static inline uint32_t
584memhsh (const char *s, size_t len) 597memhsh (const char *s, size_t len)
585{ 598{
586 uint32_t hash = STRHSH_NULL; 599 uint32_t hash = STRHSH_NULL;
587 600
588 while (len--) 601 while (len--)
589 hash = (hash ^ *s++) * 16777619; 602 hash = (hash ^ *s++) * 16777619U;
590 603
591 return hash; 604 return hash;
592} 605}
593 606
594struct str_hash 607struct str_hash

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines