Skip to content

Commit a251235

Browse files
artyom-beilisartyom-beilis
committed
Renamed private data member to _data to prevent collision
with user's data
1 parent 2583e16 commit a251235

52 files changed

Lines changed: 192 additions & 192 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎cppcms/application.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -272,8 +272,8 @@ namespace cppcms {
272272
int pool_id();
273273

274274

275-
struct data; // future use
276-
booster::hold_ptr<data> d;
275+
struct _data; // future use
276+
booster::hold_ptr<_data> d;
277277

278278
application *parent_;
279279
application *root_;

‎cppcms/applications_pool.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -146,11 +146,11 @@ namespace cppcms {
146146
struct basic_app_data;
147147
struct app_data;
148148
struct long_running_app_data;
149-
struct data;
149+
struct _data;
150150
std::string script_name();
151151
bool matched(basic_app_data &data,std::string script_name,std::string path_info,std::string &matched);
152152
service *srv_;
153-
booster::hold_ptr<data> d;
153+
booster::hold_ptr<_data> d;
154154
};
155155

156156
namespace details {

‎cppcms/base_view.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,8 @@ class CPPCMS_API base_view : booster::noncopyable {
5858
std::ostream &out();
5959

6060
private:
61-
struct data;
62-
booster::hold_ptr<data> d;
61+
struct _data;
62+
booster::hold_ptr<_data> d;
6363

6464
};
6565

‎cppcms/cache_interface.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -265,8 +265,8 @@ namespace cppcms {
265265
std::string &buffer,
266266
bool notriggers);
267267

268-
struct data;
269-
booster::hold_ptr<data> d;
268+
struct _data;
269+
booster::hold_ptr<_data> d;
270270
http::context *context_;
271271
std::set<std::string> triggers_;
272272
booster::intrusive_ptr<impl::base_cache> cache_module_;

‎cppcms/cache_pool.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@ namespace cppcms {
3434
~cache_pool();
3535
booster::intrusive_ptr<impl::base_cache> get();
3636
private:
37-
struct data;
38-
booster::hold_ptr<data> d;
37+
struct _data;
38+
booster::hold_ptr<_data> d;
3939
};
4040
}
4141

‎cppcms/filters.h‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -121,8 +121,8 @@ namespace cppcms {
121121

122122
private:
123123
streamable obj_;
124-
struct data;
125-
booster::copy_ptr<data> d;
124+
struct _data;
125+
booster::copy_ptr<_data> d;
126126
};
127127

128128
inline std::ostream &operator<<(std::ostream &out,to_upper const &obj)
@@ -148,8 +148,8 @@ namespace cppcms {
148148

149149
private:
150150
streamable obj_;
151-
struct data;
152-
booster::copy_ptr<data> d;
151+
struct _data;
152+
booster::copy_ptr<_data> d;
153153
};
154154

155155
inline std::ostream &operator<<(std::ostream &out,to_lower const &obj)
@@ -177,8 +177,8 @@ namespace cppcms {
177177

178178
private:
179179
streamable obj_;
180-
struct data;
181-
booster::copy_ptr<data> d;
180+
struct _data;
181+
booster::copy_ptr<_data> d;
182182
};
183183

184184
inline std::ostream &operator<<(std::ostream &out,to_title const &obj)
@@ -206,8 +206,8 @@ namespace cppcms {
206206

207207
private:
208208
streamable obj_;
209-
struct data;
210-
booster::copy_ptr<data> d;
209+
struct _data;
210+
booster::copy_ptr<_data> d;
211211
};
212212

213213
inline std::ostream &operator<<(std::ostream &out,escape const &obj)
@@ -234,8 +234,8 @@ namespace cppcms {
234234

235235
private:
236236
streamable obj_;
237-
struct data;
238-
booster::copy_ptr<data> d;
237+
struct _data;
238+
booster::copy_ptr<_data> d;
239239
};
240240

241241
inline std::ostream &operator<<(std::ostream &out,urlencode const &obj)
@@ -261,8 +261,8 @@ namespace cppcms {
261261

262262
private:
263263
streamable obj_;
264-
struct data;
265-
booster::copy_ptr<data> d;
264+
struct _data;
265+
booster::copy_ptr<_data> d;
266266
};
267267

268268
inline std::ostream &operator<<(std::ostream &out,base64_urlencode const &obj)
@@ -288,8 +288,8 @@ namespace cppcms {
288288

289289
private:
290290
streamable obj_;
291-
struct data;
292-
booster::copy_ptr<data> d;
291+
struct _data;
292+
booster::copy_ptr<_data> d;
293293

294294

295295

@@ -318,9 +318,9 @@ namespace cppcms {
318318
date(double time);
319319
void operator()(std::ostream &out) const;
320320
private:
321-
struct data;
321+
struct _data;
322322
double time_;
323-
booster::copy_ptr<data> d;
323+
booster::copy_ptr<_data> d;
324324
};
325325

326326
inline std::ostream &operator<<(std::ostream &out,date const &obj)
@@ -344,9 +344,9 @@ namespace cppcms {
344344
time(double time);
345345
void operator()(std::ostream &out) const;
346346
private:
347-
struct data;
347+
struct _data;
348348
double time_;
349-
booster::copy_ptr<data> d;
349+
booster::copy_ptr<_data> d;
350350
};
351351

352352
inline std::ostream &operator<<(std::ostream &out,time const &obj)
@@ -369,9 +369,9 @@ namespace cppcms {
369369
datetime(double t);
370370
void operator()(std::ostream &out) const;
371371
private:
372-
struct data;
372+
struct _data;
373373
double time_;
374-
booster::copy_ptr<data> d;
374+
booster::copy_ptr<_data> d;
375375
};
376376

377377
inline std::ostream &operator<<(std::ostream &out,datetime const &obj)

‎cppcms/form.h‎

Lines changed: 36 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -95,8 +95,8 @@ namespace cppcms {
9595
std::ostream *output_;
9696
uint32_t reserved_1;
9797
uint32_t reserved_2;
98-
struct data;
99-
booster::hold_ptr<data> d;
98+
struct _data;
99+
booster::hold_ptr<_data> d;
100100

101101
};
102102

@@ -330,8 +330,8 @@ namespace cppcms {
330330
std::stack<unsigned> return_positions_;
331331
form *current_;
332332
unsigned offset_;
333-
struct data;
334-
booster::copy_ptr<data> d;
333+
struct _data;
334+
booster::copy_ptr<_data> d;
335335

336336
};
337337

@@ -349,12 +349,12 @@ namespace cppcms {
349349
private:
350350
friend class iterator;
351351

352-
struct data;
352+
struct _data;
353353
// Widget and ownership true mine
354354
typedef std::pair<base_form *,bool> widget_type;
355355
std::vector<widget_type> elements_;
356356
form *parent_;
357-
booster::hold_ptr<data> d;
357+
booster::hold_ptr<_data> d;
358358
};
359359

360360

@@ -606,8 +606,8 @@ namespace cppcms {
606606
uint32_t has_help_ : 1;
607607
uint32_t reserverd_ : 25;
608608

609-
struct data;
610-
booster::hold_ptr<data> d;
609+
struct _data;
610+
booster::hold_ptr<_data> d;
611611
};
612612

613613
///
@@ -701,8 +701,8 @@ namespace cppcms {
701701
int high_;
702702
bool validate_charset_;
703703
size_t code_points_;
704-
struct data;
705-
booster::hold_ptr<data> d;
704+
struct _data;
705+
booster::hold_ptr<_data> d;
706706
};
707707

708708
class CPPCMS_API base_html_input : virtual public base_widget {
@@ -714,8 +714,8 @@ namespace cppcms {
714714
protected:
715715
virtual void render_value(form_context &context) = 0;
716716
private:
717-
struct data;
718-
booster::hold_ptr<data> d;
717+
struct _data;
718+
booster::hold_ptr<_data> d;
719719
std::string type_;
720720
};
721721

@@ -756,8 +756,8 @@ namespace cppcms {
756756
virtual void render_value(form_context &context);
757757
private:
758758
int size_;
759-
struct data;
760-
booster::hold_ptr<data> d;
759+
struct _data;
760+
booster::hold_ptr<_data> d;
761761
};
762762

763763
class CPPCMS_API textarea : public base_text
@@ -788,8 +788,8 @@ namespace cppcms {
788788
private:
789789
int rows_,cols_;
790790

791-
struct data;
792-
booster::hold_ptr<data> d;
791+
struct _data;
792+
booster::hold_ptr<_data> d;
793793
};
794794

795795

@@ -971,8 +971,8 @@ namespace cppcms {
971971
void check_equal(password &p2);
972972
virtual bool validate();
973973
private:
974-
struct data;
975-
booster::hold_ptr<data> d;
974+
struct _data;
975+
booster::hold_ptr<_data> d;
976976
password *password_to_check_;
977977
};
978978

@@ -1005,8 +1005,8 @@ namespace cppcms {
10051005
virtual bool validate();
10061006
private:
10071007
booster::regex expression_;
1008-
struct data;
1009-
booster::hold_ptr<data> d;
1008+
struct _data;
1009+
booster::hold_ptr<_data> d;
10101010
};
10111011

10121012
///
@@ -1020,8 +1020,8 @@ namespace cppcms {
10201020
~email();
10211021

10221022
private:
1023-
struct data;
1024-
booster::hold_ptr<data> d;
1023+
struct _data;
1024+
booster::hold_ptr<_data> d;
10251025
};
10261026

10271027
///
@@ -1062,8 +1062,8 @@ namespace cppcms {
10621062
virtual void render_value(form_context &context);
10631063
virtual void load(http::context &context);
10641064
private:
1065-
struct data;
1066-
booster::hold_ptr<data> d;
1065+
struct _data;
1066+
booster::hold_ptr<_data> d;
10671067
std::string identification_;
10681068
bool value_;
10691069
};
@@ -1145,8 +1145,8 @@ namespace cppcms {
11451145
virtual void load(http::context &context);
11461146
virtual void clear();
11471147
private:
1148-
struct data;
1149-
booster::hold_ptr<data> d;
1148+
struct _data;
1149+
booster::hold_ptr<_data> d;
11501150

11511151
struct element {
11521152
element();
@@ -1204,15 +1204,15 @@ namespace cppcms {
12041204
locale::message tr_option;
12051205

12061206
private:
1207-
struct data;
1208-
booster::copy_ptr<data> d;
1207+
struct _data;
1208+
booster::copy_ptr<_data> d;
12091209

12101210
};
12111211

12121212
std::vector<element> elements_;
12131213
private:
1214-
struct data;
1215-
booster::hold_ptr<data> d;
1214+
struct _data;
1215+
booster::hold_ptr<_data> d;
12161216

12171217
int selected_;
12181218
int default_selected_;
@@ -1227,8 +1227,8 @@ namespace cppcms {
12271227
virtual ~select();
12281228
virtual void render_input(form_context &context);
12291229
private:
1230-
struct data;
1231-
booster::hold_ptr<data> d;
1230+
struct _data;
1231+
booster::hold_ptr<_data> d;
12321232
};
12331233

12341234
class CPPCMS_API radio : public select_base {
@@ -1243,8 +1243,8 @@ namespace cppcms {
12431243
uint32_t vertical_ : 1;
12441244
uint32_t reserved_ : 31;
12451245

1246-
struct data;
1247-
booster::hold_ptr<data> d;
1246+
struct _data;
1247+
booster::hold_ptr<_data> d;
12481248
};
12491249

12501250

@@ -1271,8 +1271,8 @@ namespace cppcms {
12711271
virtual void render_value(form_context &context);
12721272
virtual void load(http::context &context);
12731273
private:
1274-
struct data;
1275-
booster::hold_ptr<data> d;
1274+
struct _data;
1275+
booster::hold_ptr<_data> d;
12761276
bool pressed_;
12771277
locale::message value_;
12781278
};

‎cppcms/http_context.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -175,8 +175,8 @@ namespace cppcms {
175175
void try_restart(bool e);
176176
booster::shared_ptr<context> self();
177177

178-
struct data;
179-
booster::hold_ptr<data> d;
178+
struct _data;
179+
booster::hold_ptr<_data> d;
180180
booster::shared_ptr<impl::cgi::connection> conn_;
181181
};
182182

‎cppcms/http_cookie.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -130,8 +130,8 @@ class CPPCMS_API cookie {
130130

131131
void write(std::ostream &) const;
132132
// for future use
133-
struct data;
134-
booster::copy_ptr<data> d;
133+
struct _data;
134+
booster::copy_ptr<_data> d;
135135

136136
// real members
137137
std::string name_;

0 commit comments

Comments
 (0)