[ViewVC] Diff of: cvs/deliantra/server/include/util.h

Comparing deliantra/server/include/util.h (file contents):
Revision 1.21 by root, Thu Dec 21 06:12:36 2006 UTC vs.
Revision 1.25 by root, Sat Dec 30 10:16:10 2006 UTC

 #else
 # define is_constant(c) 0
 #endif
 #include <cstddef>
+#include <new>
+#include <vector>
 #include <glib.h>
+#include <shstr.h>
+#include <traits.h>
 // use a gcc extension for auto declarations until ISO C++ sanctifies them
 #define AUTODECL(var,expr) typeof(expr) var = (expr)
 // makes dynamically allocated objects zero-initialised
   {
     p->~Tp ();
   }
 };
-struct refcounted
-{
-  refcounted () : refcnt (0) { }
-//  virtual ~refcounted ();
-  void refcnt_inc () { ++refcnt; }
-  void refcnt_dec () { --refcnt; }
-  bool dead () { return refcnt == 0; }
-  mutable int refcnt;
-#if 0
-private:
-  static refcounted *rc_first;
-  refcounted *rc_next;
-#endif
-};
 template<class T>
 struct refptr
 {
   T *p;
   T &operator * () const { return *p; }
   T *operator ->() const { return p; }
   operator T *() const { return p; }
 };
+typedef refptr<maptile>   maptile_ptr;
+typedef refptr<object>    object_ptr;
+typedef refptr<archetype> arch_ptr;
+typedef refptr<client>    client_ptr;
+typedef refptr<player>    player_ptr;
 struct str_hash
 {
   std::size_t operator ()(const char *s) const
   {
   {
     return !strcmp (a, b);
   }
 };
-#include <vector>
 template<class obj>
 struct unordered_vector : std::vector<obj, slice_allocator<obj> >
 {
   typedef typename unordered_vector::iterator iterator;
 typedef double tstamp;
 // return current time as timestampe
 tstamp now ();
+int similar_direction (int a, int b);
 #endif

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