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.103 by root, Thu Apr 29 15:49:04 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
… …
93// sign returns -1 or +1 102// sign returns -1 or +1
94template<typename T> 103template<typename T>
95static inline T sign (T v) { return v < 0 ? -1 : +1; } 104static inline T sign (T v) { return v < 0 ? -1 : +1; }
96// relies on 2c representation 105// relies on 2c representation
97template<> 106template<>
98inline sint8 sign (sint8 v) { return 1 - (sint8 (uint8 (v) >> 7) * 2); } 107inline sint8 sign (sint8 v) { return 1 - (sint8 (uint8 (v) >> 7) * 2); }
108template<>
109inline sint16 sign (sint16 v) { return 1 - (sint16 (uint16 (v) >> 15) * 2); }
110template<>
111inline sint32 sign (sint32 v) { return 1 - (sint32 (uint32 (v) >> 31) * 2); }
99 112
100// sign0 returns -1, 0 or +1 113// sign0 returns -1, 0 or +1
101template<typename T> 114template<typename T>
102static inline T sign0 (T v) { return v ? sign (v) : 0; } 115static inline T sign0 (T v) { return v ? sign (v) : 0; }
116
117template<typename T, typename U>
118static inline T copysign (T a, U b) { return a > 0 ? b : -b; }
103 119
104// div* only work correctly for div > 0 120// div* only work correctly for div > 0
105// div, with correct rounding (< 0.5 downwards, >=0.5 upwards) 121// div, with correct rounding (< 0.5 downwards, >=0.5 upwards)
106template<typename T> static inline T div (T val, T div) 122template<typename T> static inline T div (T val, T div)
107{ 123{
… …
467 return !is_constant (num) ? get_range (num) // non-constant 483 return !is_constant (num) ? get_range (num) // non-constant
468 : num & (num - 1) ? (this->next () * (uint64_t)num) >> 32U // constant, non-power-of-two 484 : num & (num - 1) ? (this->next () * (uint64_t)num) >> 32U // constant, non-power-of-two
469 : this->next () & (num - 1); // constant, power-of-two 485 : this->next () & (num - 1); // constant, power-of-two
470 } 486 }
471 487
472 // return a number within (min .. max) 488 // return a number within the closed interval [min .. max]
473 int operator () (int r_min, int r_max) 489 int operator () (int r_min, int r_max)
474 { 490 {
475 return is_constant (r_min) && is_constant (r_max) && r_min <= r_max 491 return is_constant (r_min) && is_constant (r_max) && r_min <= r_max
476 ? r_min + operator ()(r_max - r_min + 1) 492 ? r_min + operator ()(r_max - r_min + 1)
477 : get_range (r_min, r_max); 493 : get_range (r_min, r_max);
478 } 494 }
479 495
496 // return a number within the closed interval [0..1]
480 double operator ()() 497 double operator ()()
481 { 498 {
482 return this->next () / (double)0xFFFFFFFFU; 499 return this->next () / (double)0xFFFFFFFFU;
483 } 500 }
484 501
… …
559typedef refptr<maptile> maptile_ptr; 576typedef refptr<maptile> maptile_ptr;
560typedef refptr<object> object_ptr; 577typedef refptr<object> object_ptr;
561typedef refptr<archetype> arch_ptr; 578typedef refptr<archetype> arch_ptr;
562typedef refptr<client> client_ptr; 579typedef refptr<client> client_ptr;
563typedef refptr<player> player_ptr; 580typedef refptr<player> player_ptr;
581typedef refptr<region> region_ptr;
564 582
565#define STRHSH_NULL 2166136261 583#define STRHSH_NULL 2166136261
566 584
567static inline uint32_t 585static inline uint32_t
568strhsh (const char *s) 586strhsh (const char *s)
… …
573 // FNV-1a is faster on many cpus because the multiplication 591 // FNV-1a is faster on many cpus because the multiplication
574 // runs concurrently with the looping logic. 592 // runs concurrently with the looping logic.
575 uint32_t hash = STRHSH_NULL; 593 uint32_t hash = STRHSH_NULL;
576 594
577 while (*s) 595 while (*s)
578 hash = (hash ^ *s++) * 16777619; 596 hash = (hash ^ *s++) * 16777619U;
579 597
580 return hash; 598 return hash;
581} 599}
582 600
583static inline uint32_t 601static inline uint32_t
584memhsh (const char *s, size_t len) 602memhsh (const char *s, size_t len)
585{ 603{
586 uint32_t hash = STRHSH_NULL; 604 uint32_t hash = STRHSH_NULL;
587 605
588 while (len--) 606 while (len--)
589 hash = (hash ^ *s++) * 16777619; 607 hash = (hash ^ *s++) * 16777619U;
590 608
591 return hash; 609 return hash;
592} 610}
593 611
594struct str_hash 612struct str_hash

Diff Legend

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