ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/rxvtutil.h
(Generate patch)

Comparing rxvt-unicode/src/rxvtutil.h (file contents):
Revision 1.60 by sf-exg, Tue Oct 28 09:05:33 2014 UTC vs.
Revision 1.63 by root, Sun Dec 14 04:52:10 2014 UTC

1#ifndef RXVT_UTIL_H 1#ifndef RXVT_UTIL_H
2#define RXVT_UTIL_H 2#define RXVT_UTIL_H
3 3
4#include <new>
5#include <stdlib.h> 4#include <stdlib.h>
6#include <string.h> 5#include <string.h>
7#include "ecb.h" 6#include "ecb.h"
8#include "estl.h" 7#include "estl.h"
9 8
… …
22template<typename T, typename U> static inline void min_it (T &a, U b) { a = a < (T)b ? a : (T)b; } 21template<typename T, typename U> static inline void min_it (T &a, U b) { a = a < (T)b ? a : (T)b; }
23template<typename T, typename U> static inline void max_it (T &a, U b) { a = a > (T)b ? a : (T)b; } 22template<typename T, typename U> static inline void max_it (T &a, U b) { a = a > (T)b ? a : (T)b; }
24 23
25template<typename T, typename U, typename V> static inline T clamp (T v, U a, V b) { return v < (T)a ? a : v >(T)b ? b : v; } 24template<typename T, typename U, typename V> static inline T clamp (T v, U a, V b) { return v < (T)a ? a : v >(T)b ? b : v; }
26template<typename T, typename U, typename V> static inline void clamp_it (T &v, U a, V b) { v = v < (T)a ? a : v >(T)b ? b : v; } 25template<typename T, typename U, typename V> static inline void clamp_it (T &v, U a, V b) { v = v < (T)a ? a : v >(T)b ? b : v; }
27
28template<typename T> static inline T squared_diff (T a, T b) { return (a - b) * (a - b); }
29 26
30// linear interpolation 27// linear interpolation
31template<typename T, typename U, typename P> 28template<typename T, typename U, typename P>
32static inline T 29static inline T
33lerp (T a, U b, P p) 30lerp (T a, U b, P p)
… …
61{ 58{
62 void *operator new (size_t s); 59 void *operator new (size_t s);
63 void operator delete (void *p, size_t s); 60 void operator delete (void *p, size_t s);
64}; 61};
65 62
66// alas new/delete cannot be specified as inline in C++11 (see 17.6.4.6)
67void *operator new (size_t s) throw (std::bad_alloc);
68void operator delete (void *p) throw ();
69
70struct stringvec : simplevec<char *> 63struct stringvec : simplevec<char *>
71{ 64{
72 ~stringvec () 65 ~stringvec ()
73 { 66 {
74 for (char **c = begin (); c != end (); c++) 67 for (char **c = begin (); c != end (); c++)
… …
91 T &operator [] (int i) { return * (T *) (& ((* (simplevec<void *> *)this)[i])); } 84 T &operator [] (int i) { return * (T *) (& ((* (simplevec<void *> *)this)[i])); }
92 const T &operator [] (int i) const { return * (const T *) (& ((* (const simplevec<void *> *)this)[i])); } 85 const T &operator [] (int i) const { return * (const T *) (& ((* (const simplevec<void *> *)this)[i])); }
93}; 86};
94#endif 87#endif
95 88
96template<typename T> 89typedef estl::scoped_array<char> auto_str;
97struct auto_ptr
98{
99 T *p;
100
101 auto_ptr () : p (0) { }
102
103 explicit
104 auto_ptr (T *a) : p (a) { }
105
106 auto_ptr (auto_ptr &a)
107 {
108 p = a.p;
109 a.p = 0;
110 }
111
112 template<typename A>
113 auto_ptr (auto_ptr<A> &a)
114 {
115 p = a.p;
116 a.p = 0;
117 }
118
119 ~auto_ptr ()
120 {
121 delete p;
122 }
123
124 void reset (T *a)
125 {
126 delete p;
127 p = a;
128 }
129
130 // void because it makes sense in our context
131 void operator =(auto_ptr &a)
132 {
133 reset (a.release ());
134 }
135
136 template<typename A>
137 void operator =(auto_ptr<A> &a)
138 {
139 reset (a.release ());
140 }
141
142 T *operator ->() const { return p; }
143 T &operator *() const { return *p; }
144
145 operator T *() { return p; }
146 T *get () const { return p; }
147
148 T *release()
149 {
150 T *r = p;
151 p = 0;
152 return r;
153 }
154};
155
156typedef auto_ptr<char> auto_str;
157 90
158#endif 91#endif
159 92

Diff Legend

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