[ViewVC] Diff of: cvs/deliantra/server/common/utils.C

Comparing deliantra/server/common/utils.C (file contents):
Revision 1.11 by root, Tue Sep 12 19:20:06 2006 UTC vs.
Revision 1.12 by root, Tue Sep 12 20:55:40 2006 UTC

 /*
  * static char *rcsid_utils_c =
- *   "$Id: utils.C,v 1.11 2006/09/12 19:20:06 root Exp $";
+ *   "$Id: utils.C,v 1.12 2006/09/12 20:55:40 root Exp $";
  */
 /*
     CrossFire, A Multiplayer game for X-windows
     strcpy (input, tmp);
   return;
 }
-void *
+void *alloc (int s) throw (std::bad_alloc)
-zero_initialised::operator new (size_t s, void *p)
 {
-  memset (p, 0, s);
+  if (s)
-  return p;
-}
-void *
-zero_initialised::operator new (size_t s)
-{
-  //return calloc (1, s);
-  return g_slice_alloc0 (s);
+    return g_slice_alloc (s);
+  else
+    return 0;
 }
-void *
+void dealloc (void *p, int s) throw ()
-  zero_initialised::operator new[] (size_t s)
 {
-  //return calloc (1, s);
+  if (s)
-  return g_slice_alloc0 (s);
-}
-void
-zero_initialised::operator delete (void *p, size_t s)
-{
-  //free (p); return;
-  g_slice_free1 (s, p);
+    g_slice_free1 (s, p);
-}
-void
-zero_initialised::operator delete[] (void *p, size_t s)
-{
-  //free (p); return;
-  g_slice_free1 (s, p);
 }
 void assign (char *dst, const char *src, int maxlen)
 {
   if (!src)

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