ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/include/shstr.h
(Generate patch)

Comparing deliantra/server/include/shstr.h (file contents):
Revision 1.18 by root, Tue Jul 10 05:51:38 2007 UTC vs.
Revision 1.23 by root, Sun Dec 28 06:59:27 2008 UTC

1/* 1/*
2 * This file is part of Crossfire TRT, the Roguelike Realtime MORPG. 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team 4 * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * 5 *
6 * Crossfire TRT is free software: you can redistribute it and/or modify 6 * Deliantra is free software: you can redistribute it and/or modify
7 * it under the terms of the GNU General Public License as published by 7 * it under the terms of the GNU General Public License as published by
8 * the Free Software Foundation, either version 3 of the License, or 8 * the Free Software Foundation, either version 3 of the License, or
9 * (at your option) any later version. 9 * (at your option) any later version.
10 * 10 *
11 * This program is distributed in the hope that it will be useful, 11 * This program is distributed in the hope that it will be useful,
… …
14 * GNU General Public License for more details. 14 * GNU General Public License for more details.
15 * 15 *
16 * You should have received a copy of the GNU General Public License 16 * You should have received a copy of the GNU General Public License
17 * along with this program. If not, see <http://www.gnu.org/licenses/>. 17 * along with this program. If not, see <http://www.gnu.org/licenses/>.
18 * 18 *
19 * The authors can be reached via e-mail to <crossfire@schmorp.de> 19 * The authors can be reached via e-mail to <support@deliantra.net>
20 */ 20 */
21 21
22#ifndef SHSTR_H__ 22#ifndef SHSTR_H__
23#define SHSTR_H__ 23#define SHSTR_H__
24 24
25#include <sstream> 25#include <sstream>
26 26
27#include "util.h" 27#include "util.h"
28
29extern size_t shstr_alloc;
28 30
29extern int buf_overflow (const char *buf1, const char *buf2, int bufsize); 31extern int buf_overflow (const char *buf1, const char *buf2, int bufsize);
30 32
31struct shstr 33struct shstr
32{ 34{
… …
114 s = intern (str); 116 s = intern (str);
115 117
116 return *this; 118 return *this;
117 } 119 }
118 120
119 bool operator ==(const shstr &b)
120 {
121 return s == b.s;
122 }
123
124 bool operator !=(const shstr &b) 121 bool operator !=(const shstr &b)
125 { 122 {
126 return !(*this == b); 123 return !(*this == b);
127 } 124 }
128}; 125};
126
127inline bool operator ==(const shstr &a, const shstr &b)
128{
129 return a.s == b.s;
130}
129 131
130inline int strlen (const shstr &sh) 132inline int strlen (const shstr &sh)
131{ 133{
132 return sh.length (); 134 return sh.length ();
133} 135}
… …
163 shstr_cmp (const shstr_cmp &sh) 165 shstr_cmp (const shstr_cmp &sh)
164 : s (sh.s) 166 : s (sh.s)
165 { 167 {
166 } 168 }
167 169
170 shstr_cmp (const shstr &sh)
171 : s (sh.s)
172 {
173 }
174
175 // this is used for informational messages and the like
176 const char *operator &() const { return s; }
177
168 shstr_cmp &operator =(const shstr_cmp sh) { s = sh.s; return *this; } 178 shstr_cmp &operator =(const shstr_cmp sh) { s = sh.s; return *this; }
169 operator const char *() const { return s; } 179 operator const char *() const { return s; }
170}; 180};
171 181
172inline bool operator ==(const shstr_cmp &a, const shstr &b) 182inline bool operator ==(const shstr_cmp &a, const shstr &b)
… …
177inline bool operator ==(const shstr &a, const shstr_cmp &b) 187inline bool operator ==(const shstr &a, const shstr_cmp &b)
178{ 188{
179 return b == a; 189 return b == a;
180} 190}
181 191
192extern const shstr shstr_null;
193
182#define def(str) extern const shstr shstr_ ## str; 194#define def(str) extern const shstr shstr_ ## str;
183# include "shstrinc.h" 195# include "shstrinc.h"
184#undef def 196#undef def
185 197
186#endif 198#endif

Diff Legend

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