ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/rxvtutil.C
Revision: 1.21
Committed: Tue Oct 28 09:05:33 2014 UTC (9 years, 7 months ago) by sf-exg
Content type: text/plain
Branch: MAIN
Changes since 1.20: +13 -0 lines
Log Message:
It is not legal to specify new/delete as inline in C++11.

File Contents

# User Rev Content
1 root 1.7 /*----------------------------------------------------------------------*
2 root 1.6 * File: rxvtutil.C
3     *----------------------------------------------------------------------*
4     *
5     * All portions of code are copyright by their respective author/s.
6 root 1.13 * Copyright (c) 2004-2006 Marc Lehmann <schmorp@schmorp.de>
7 root 1.6 *
8     * This program is free software; you can redistribute it and/or modify
9     * it under the terms of the GNU General Public License as published by
10 root 1.19 * the Free Software Foundation; either version 3 of the License, or
11 root 1.6 * (at your option) any later version.
12     *
13     * This program is distributed in the hope that it will be useful,
14     * but WITHOUT ANY WARRANTY; without even the implied warranty of
15     * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16     * GNU General Public License for more details.
17     *
18     * You should have received a copy of the GNU General Public License
19     * along with this program; if not, write to the Free Software
20     * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
21     *----------------------------------------------------------------------*/
22    
23 sf-exg 1.20 // we include emman.c here to avoid relying on a C compiler, or
24     // on the c++ compiler not complaining about .c, which is unlikely,
25     // but...
26     // This must be the first include, because the _GNU_SOURCE and
27     // _XOPEN_SOURCE macros, used by emman.c, must be defined before
28     // inclusion of any header.
29     #include "emman.c"
30    
31 sf-exg 1.17 #include <stdlib.h>
32     #include <string.h>
33 sf-exg 1.16 #include <inttypes.h>
34 root 1.1
35     #include "rxvtutil.h"
36    
37 root 1.2 void *
38     zero_initialized::operator new (size_t s)
39     {
40     void *p = malloc (s);
41    
42     memset (p, 0, s);
43     return p;
44     }
45    
46     void
47     zero_initialized::operator delete (void *p, size_t s)
48     {
49     free (p);
50     }
51    
52 sf-exg 1.21 void *
53     operator new (size_t s) throw (std::bad_alloc)
54     {
55     // TODO: use rxvt_malloc
56     return malloc (s);
57     }
58    
59     void
60     operator delete (void *p) throw ()
61     {
62     free (p);
63     }
64    
65 root 1.3 static void *temp_buf;
66     static uint32_t temp_len;
67    
68     void *
69     rxvt_temp_buf (int len)
70     {
71     if (len > temp_len)
72 ayin 1.9 {
73 sf-exg 1.12 free (temp_buf);
74     temp_buf = malloc (len);
75 root 1.3 temp_len = len;
76     }
77 ayin 1.9
78 root 1.3 return temp_buf;
79     }
80 root 1.1