Renamed private data member to _data to prevent collision

with user's data

cppcms/application.h

@@ -272,8 +272,8 @@ namespace cppcms {
 		int pool_id();
 
 
-		struct data; // future use
-		booster::hold_ptr<data> d;
+		struct _data; // future use
+		booster::hold_ptr<_data> d;
 
 		application *parent_;
 		application *root_;

cppcms/applications_pool.h

@@ -146,11 +146,11 @@ namespace cppcms {
 		struct basic_app_data;
 		struct app_data;
 		struct long_running_app_data;
-		struct data;
+		struct _data;
 		std::string script_name();
 		bool matched(basic_app_data &data,std::string script_name,std::string path_info,std::string &matched);
 		service *srv_;
-		booster::hold_ptr<data> d;
+		booster::hold_ptr<_data> d;
 	};
 
 	namespace details {

cppcms/base_view.h

@@ -58,8 +58,8 @@ protected:
 	std::ostream &out();
 
 private:
-	struct data;
-	booster::hold_ptr<data> d;
+	struct _data;
+	booster::hold_ptr<_data> d;
 
 };
 

cppcms/cache_interface.h

@@ -265,8 +265,8 @@ namespace cppcms {
 				std::string &buffer,
 				bool notriggers);
 
-		struct data;
-		booster::hold_ptr<data> d;
+		struct _data;
+		booster::hold_ptr<_data> d;
 		http::context *context_;
 		std::set<std::string> triggers_;
 		booster::intrusive_ptr<impl::base_cache> cache_module_;

cppcms/cache_pool.h

@@ -34,8 +34,8 @@ namespace cppcms {
 		~cache_pool();
 		booster::intrusive_ptr<impl::base_cache> get();
 	private:
-		struct data;
-		booster::hold_ptr<data> d;
+		struct _data;
+		booster::hold_ptr<_data> d;
 	};
 }
 

cppcms/filters.h

@@ -121,8 +121,8 @@ namespace cppcms {
 
 		private:						
 			streamable obj_;			
-			struct data;					
-			booster::copy_ptr<data> d;				
+			struct _data;					
+			booster::copy_ptr<_data> d;				
 		};
 
 		inline std::ostream &operator<<(std::ostream &out,to_upper const &obj)
@@ -148,8 +148,8 @@ namespace cppcms {
 
 		private:						
 			streamable obj_;			
-			struct data;					
-			booster::copy_ptr<data> d;				
+			struct _data;					
+			booster::copy_ptr<_data> d;				
 		};
 
 		inline std::ostream &operator<<(std::ostream &out,to_lower const &obj)
@@ -177,8 +177,8 @@ namespace cppcms {
 
 		private:						
 			streamable obj_;			
-			struct data;					
-			booster::copy_ptr<data> d;				
+			struct _data;					
+			booster::copy_ptr<_data> d;				
 		};
 
 		inline std::ostream &operator<<(std::ostream &out,to_title const &obj)
@@ -206,8 +206,8 @@ namespace cppcms {
 
 		private:						
 			streamable obj_;			
-			struct data;					
-			booster::copy_ptr<data> d;				
+			struct _data;					
+			booster::copy_ptr<_data> d;				
 		};
 
 		inline std::ostream &operator<<(std::ostream &out,escape const &obj)
@@ -234,8 +234,8 @@ namespace cppcms {
 
 		private:						
 			streamable obj_;			
-			struct data;					
-			booster::copy_ptr<data> d;				
+			struct _data;					
+			booster::copy_ptr<_data> d;				
 		};
 
 		inline std::ostream &operator<<(std::ostream &out,urlencode const &obj)
@@ -261,8 +261,8 @@ namespace cppcms {
 
 		private:						
 			streamable obj_;			
-			struct data;					
-			booster::copy_ptr<data> d;				
+			struct _data;					
+			booster::copy_ptr<_data> d;				
 		};
 
 		inline std::ostream &operator<<(std::ostream &out,base64_urlencode const &obj)
@@ -288,8 +288,8 @@ namespace cppcms {
 
 		private:						
 			streamable obj_;			
-			struct data;					
-			booster::copy_ptr<data> d;				
+			struct _data;					
+			booster::copy_ptr<_data> d;				
 		
 		
 		
@@ -318,9 +318,9 @@ namespace cppcms {
 			date(double time);
 			void operator()(std::ostream &out) const;
 		private:
-			struct data;
+			struct _data;
 			double time_;
-			booster::copy_ptr<data> d;
+			booster::copy_ptr<_data> d;
 		};
 		
 		inline std::ostream &operator<<(std::ostream &out,date const &obj)
@@ -344,9 +344,9 @@ namespace cppcms {
 			time(double time);
 			void operator()(std::ostream &out) const;
 		private:
-			struct data;
+			struct _data;
 			double time_;
-			booster::copy_ptr<data> d;
+			booster::copy_ptr<_data> d;
 		};
 		
 		inline std::ostream &operator<<(std::ostream &out,time const &obj)
@@ -369,9 +369,9 @@ namespace cppcms {
 			datetime(double t);
 			void operator()(std::ostream &out) const;
 		private:
-			struct data;
+			struct _data;
 			double time_;
-			booster::copy_ptr<data> d;
+			booster::copy_ptr<_data> d;
 		};
 		
 		inline std::ostream &operator<<(std::ostream &out,datetime const &obj)

cppcms/form.h

@@ -95,8 +95,8 @@ namespace cppcms {
 		std::ostream *output_;
 		uint32_t reserved_1;
 		uint32_t reserved_2;
-		struct data;
-		booster::hold_ptr<data> d;
+		struct _data;
+		booster::hold_ptr<_data> d;
 
 	};
 
@@ -330,8 +330,8 @@ namespace cppcms {
 			std::stack<unsigned> return_positions_;
 			form *current_;
 			unsigned offset_;
-			struct data;
-			booster::copy_ptr<data> d;
+			struct _data;
+			booster::copy_ptr<_data> d;
 
 		};
 
@@ -349,12 +349,12 @@ namespace cppcms {
 	private:
 		friend class iterator;
 
-		struct data;
+		struct _data;
 		// Widget and ownership true mine
 		typedef std::pair<base_form *,bool> widget_type;
 		std::vector<widget_type> elements_;
 		form *parent_;
-		booster::hold_ptr<data> d;
+		booster::hold_ptr<_data> d;
 	};
 
 
@@ -606,8 +606,8 @@ namespace cppcms {
 			uint32_t has_help_ : 1;
 			uint32_t reserverd_ : 25;
 
-			struct data;
-			booster::hold_ptr<data> d;
+			struct _data;
+			booster::hold_ptr<_data> d;
 		};
 
 		///
@@ -701,8 +701,8 @@ namespace cppcms {
 			int high_;
 			bool validate_charset_;
 			size_t code_points_;
-			struct data;
-			booster::hold_ptr<data> d;
+			struct _data;
+			booster::hold_ptr<_data> d;
 		};
 
 		class CPPCMS_API base_html_input : virtual public base_widget {
@@ -714,8 +714,8 @@ namespace cppcms {
 		protected:
 			virtual void render_value(form_context &context) = 0;
 		private:
-			struct data;
-			booster::hold_ptr<data> d;
+			struct _data;
+			booster::hold_ptr<_data> d;
 			std::string type_;
 		};
 
@@ -756,8 +756,8 @@ namespace cppcms {
 			virtual void render_value(form_context &context);
 		private:
 			int size_;
-			struct data;
-			booster::hold_ptr<data> d;
+			struct _data;
+			booster::hold_ptr<_data> d;
 		};
 
 		class CPPCMS_API textarea : public base_text 
@@ -788,8 +788,8 @@ namespace cppcms {
 		private:
 			int rows_,cols_;
 
-			struct data;
-			booster::hold_ptr<data> d;
+			struct _data;
+			booster::hold_ptr<_data> d;
 		};
 
 
@@ -971,8 +971,8 @@ namespace cppcms {
 			void check_equal(password &p2);
 			virtual bool validate();
 		private:
-			struct data;
-			booster::hold_ptr<data> d;
+			struct _data;
+			booster::hold_ptr<_data> d;
 			password *password_to_check_;
 		};
 
@@ -1005,8 +1005,8 @@ namespace cppcms {
 			virtual bool validate();
 		private:
 			booster::regex expression_;
-			struct data;
-			booster::hold_ptr<data> d;
+			struct _data;
+			booster::hold_ptr<_data> d;
 		};
 
 		///
@@ -1020,8 +1020,8 @@ namespace cppcms {
 			~email();
 
 		private:
-			struct data;
-			booster::hold_ptr<data> d;
+			struct _data;
+			booster::hold_ptr<_data> d;
 		};
 
 		///
@@ -1062,8 +1062,8 @@ namespace cppcms {
 			virtual void render_value(form_context &context);
 			virtual void load(http::context &context);
 		private:
-			struct data;
-			booster::hold_ptr<data> d;
+			struct _data;
+			booster::hold_ptr<_data> d;
 			std::string identification_;
 			bool value_;
 		};
@@ -1145,8 +1145,8 @@ namespace cppcms {
 			virtual void load(http::context &context);
 			virtual void clear();
 		private:
-			struct data;
-			booster::hold_ptr<data> d;
+			struct _data;
+			booster::hold_ptr<_data> d;
 
 			struct element {
 				element();
@@ -1204,15 +1204,15 @@ namespace cppcms {
 				locale::message tr_option;
 
 			private:
-				struct data;
-				booster::copy_ptr<data> d;
+				struct _data;
+				booster::copy_ptr<_data> d;
 
 			};
 
 			std::vector<element> elements_;
 		private:
-			struct data;
-			booster::hold_ptr<data> d;
+			struct _data;
+			booster::hold_ptr<_data> d;
 
 			int selected_;
 			int default_selected_;
@@ -1227,8 +1227,8 @@ namespace cppcms {
 			virtual ~select();
 			virtual void render_input(form_context &context);
 		private:
-			struct data;
-			booster::hold_ptr<data> d;
+			struct _data;
+			booster::hold_ptr<_data> d;
 		};
 
 		class CPPCMS_API radio : public select_base {
@@ -1243,8 +1243,8 @@ namespace cppcms {
 			uint32_t vertical_ : 1;
 			uint32_t reserved_ : 31;
 
-			struct data;
-			booster::hold_ptr<data> d;
+			struct _data;
+			booster::hold_ptr<_data> d;
 		};
 
 
@@ -1271,8 +1271,8 @@ namespace cppcms {
 			virtual void render_value(form_context &context);
 			virtual void load(http::context &context);
 		private:
-			struct data;
-			booster::hold_ptr<data> d;
+			struct _data;
+			booster::hold_ptr<_data> d;
 			bool pressed_;
 			locale::message value_;
 		};

cppcms/http_context.h

@@ -175,8 +175,8 @@ namespace cppcms {
 			void try_restart(bool e);
 			booster::shared_ptr<context> self();
 
-			struct data;
-			booster::hold_ptr<data> d;
+			struct _data;
+			booster::hold_ptr<_data> d;
 			booster::shared_ptr<impl::cgi::connection> conn_;
 		};
 

cppcms/http_cookie.h

@@ -130,8 +130,8 @@ private:
 
 	void write(std::ostream &) const;
 	// for future use
-	struct data;
-	booster::copy_ptr<data> d;
+	struct _data;
+	booster::copy_ptr<_data> d;
 
 	// real members
 	std::string name_;

cppcms/http_request.h

@@ -121,12 +121,12 @@ namespace http {
 				std::string &key,
 				std::string &value);
 
-		struct data;
+		struct _data;
 		form_type get_;
 		form_type post_;
 		files_type files_;
 		cookies_type cookies_;
-		booster::hold_ptr<data> d;
+		booster::hold_ptr<_data> d;
 		impl::cgi::connection *conn_;
 	};
 

cppcms/http_response.h

@@ -166,8 +166,8 @@ namespace http {
 		void write_http_headers(std::ostream &);
 		std::string get_async_chunk();
 
-		struct data;
-		booster::hold_ptr<data> d;
+		struct _data;
+		booster::hold_ptr<_data> d;
 
 		context &context_;
 		std::ostream *stream_;

cppcms/json.h

@@ -244,13 +244,13 @@ namespace json {
 		void write(std::ostream &out,int tabs) const;
 		void write_value(std::ostream &out,int tabs) const;
 
-		struct data;
+		struct _data;
 		struct CPPCMS_API copyable {
 
-			data *operator->() { return &*d; }
-			data &operator*() { return *d; }
-			data const *operator->() const { return &*d; }
-			data const &operator*() const { return *d; }
+			_data *operator->() { return &*d; }
+			_data &operator*() { return *d; }
+			_data const *operator->() const { return &*d; }
+			_data const &operator*() const { return *d; }
 
 			copyable();
 			copyable(copyable const &r);
@@ -262,7 +262,7 @@ namespace json {
 				d.swap(other.d);
 			}
 		private:
-			booster::copy_ptr<data> d;
+			booster::copy_ptr<_data> d;
 		} d;
 
 		friend struct copyable;

cppcms/rpc_json.h

@@ -107,8 +107,8 @@ namespace rpc {
 		std::string method_;
 		bool notification_;
 
-		struct data;
-		booster::hold_ptr<data> d;
+		struct _data;
+		booster::hold_ptr<_data> d;
 	};
 
 	///
@@ -200,8 +200,8 @@ namespace rpc {
 
 		std::string smd_;
 		
-		struct data;
-		booster::hold_ptr<data> d;
+		struct _data;
+		booster::hold_ptr<_data> d;
 	};
 
 

cppcms/session_cookies.h

@@ -48,8 +48,8 @@ namespace sessions {
 		virtual bool load(session_interface &,std::string &data,time_t &timeout);
 		virtual void clear(session_interface &);
 	private:
-		struct data;
-		booster::hold_ptr<data> d;
+		struct _data;
+		booster::hold_ptr<_data> d;
 		std::auto_ptr<encryptor> encryptor_;
 	};
 

cppcms/session_dual.h

@@ -43,8 +43,8 @@ public:
 	virtual bool load(session_interface &,std::string &data,time_t &timeout);
 	virtual void clear(session_interface &);
 private:
-	struct data;
-	booster::hold_ptr<data> d;
+	struct _data;
+	booster::hold_ptr<_data> d;
 	booster::shared_ptr<session_cookies>	client_;
 	booster::shared_ptr<session_sid>	server_;
 	size_t data_size_limit_;

cppcms/session_interface.h

@@ -138,8 +138,8 @@ private:
 	// storage itself
 	
 	booster::shared_ptr<session_api> storage_;
-	struct data;
-	booster::hold_ptr<data> d; // for future use
+	struct _data;
+	booster::hold_ptr<_data> d; // for future use
 
 	int cookie_age();
 	time_t   session_age();

cppcms/session_pool.h

@@ -57,14 +57,14 @@ namespace cppcms {
 		template<typename Encryptor>
 		struct enc_factory;
 		
-		struct data;
+		struct _data;
 
 		friend struct cookies_factory;
 		friend struct dual_factory;
 		friend struct sid_factory;
 		friend class gc_job;
 
-		booster::hold_ptr<data> d;
+		booster::hold_ptr<_data> d;
 
 		std::auto_ptr<session_api_factory> backend_;
 		std::auto_ptr<sessions::encryptor_factory> encryptor_;

cppcms/session_sid.h

@@ -42,8 +42,8 @@ namespace sessions {
 		bool valid_sid(std::string const &cookie,std::string &id);
 		std::string key(std::string sid);
 		
-		struct data;
-		booster::hold_ptr<data> d;
+		struct _data;
+		booster::hold_ptr<_data> d;
 		booster::shared_ptr<session_storage> storage_;
 	};
 

cppcms/urandom.h

@@ -32,8 +32,8 @@ namespace cppcms {
 		void generate(void *,unsigned n);
 
 	private:
-		struct data;
-		booster::hold_ptr<data> d;
+		struct _data;
+		booster::hold_ptr<_data> d;
 		
 
 	};

cppcms/url_dispatcher.h

@@ -159,8 +159,8 @@ namespace cppcms {
 		friend class application;
 		void mount(std::string match,application &app,int part);
 
-		struct data;
-		booster::hold_ptr<data> d;
+		struct _data;
+		booster::hold_ptr<_data> d;
 	};
 
 } // cppcms

cppcms/views_pool.h

@@ -63,9 +63,9 @@ namespace cppcms {
 		static views_pool &static_instance();
 	private:
 
-		struct data;
+		struct _data;
 		struct skin;
-		booster::hold_ptr<data> d;
+		booster::hold_ptr<_data> d;
 	};
 
 }

private/connection_forwarder.h

@@ -30,8 +30,8 @@ namespace cppcms {
 		virtual void main(std::string);
 	private:
 
-		struct data;
-		booster::hold_ptr<data> d;
+		struct _data;
+		booster::hold_ptr<_data> d;
 		std::string ip_;
 		int port_;
 	};

private/session_posix_file_storage.h

@@ -40,7 +40,7 @@ namespace sessions {
 		virtual void remove(std::string const &sid);
 	private:
 		struct locked_file;
-		struct data;
+		struct _data;
 		bool read_timestamp(int fd);
 		bool read_from_file(int fd,time_t &timeout,std::string &data);
 		void save_to_file(int fd,time_t timeout,std::string const &in);
@@ -54,7 +54,7 @@ namespace sessions {
 
 		// members
 	
-		booster::hold_ptr<data> d;
+		booster::hold_ptr<_data> d;
 
 		void *memory_;
 		std::string path_;
@@ -76,7 +76,7 @@ namespace sessions {
 		virtual void gc_job();
 		virtual ~session_file_storage_factory();
 	private:
-		struct data;
+		struct _data;
 		booster::shared_ptr<session_file_storage> storage_;
 	};
 } // sessions

private/session_win32_file_storage.h

@@ -39,7 +39,7 @@ namespace sessions {
 		virtual void remove(std::string const &sid);
 	private:
 		struct locked_file;
-		struct data;
+		struct _data;
 		bool read_timestamp(void *h);
 		bool read_from_file(void *h,time_t &timeout,std::string &data);
 		void save_to_file(void *h,time_t timeout,std::string const &in);
@@ -50,7 +50,7 @@ namespace sessions {
 
 		// members
 	
-		booster::hold_ptr<data> d;
+		booster::hold_ptr<_data> d;
 
 		std::string path_;
 		// friends 
@@ -66,7 +66,7 @@ namespace sessions {
 		virtual void gc_job();
 		virtual ~session_file_storage_factory();
 	private:
-		struct data;
+		struct _data;
 		booster::shared_ptr<session_file_storage> storage_;
 	};
 } // sessions

private/tcp_cache_server.h

@@ -36,8 +36,8 @@ public:
 private:
 	class session;
 	class server;
-	struct data;
-	booster::hold_ptr<data> d;
+	struct _data;
+	booster::hold_ptr<_data> d;
 };
 
 } // impl

src/application.cpp

@@ -40,8 +40,8 @@
 
 namespace cppcms {
 
-struct application::data {
-	data(cppcms::service *s):
+struct application::_data {
+	_data(cppcms::service *s):
 		service(s),
 		pool_id(-1)
 	{
@@ -54,7 +54,7 @@ struct application::data {
 };
 
 application::application(cppcms::service &srv) :
-	d(new data(&srv)),
+	d(new _data(&srv)),
 	refs_(0)
 {
 	parent_=root_=this;

src/applications_pool.cpp

@@ -102,7 +102,7 @@ namespace cppcms {
 		}
 	};
 
-	struct applications_pool::data {
+	struct applications_pool::_data {
 		std::vector<booster::shared_ptr<app_data> > apps;
 		typedef std::map<application *,booster::shared_ptr<long_running_app_data> > long_running_aps_type;
 		long_running_aps_type long_running_aps;
@@ -114,7 +114,7 @@ namespace cppcms {
 
 applications_pool::applications_pool(service &srv,int limit) :
 	srv_(&srv),
-	d(new applications_pool::data())
+	d(new applications_pool::_data())
 {
 	d->limit=limit;
 }
@@ -226,7 +226,7 @@ booster::intrusive_ptr<application> applications_pool::get(std::string script_na
 		d->apps[i]->pool.erase(app.get());
 		return app;
 	}
-	for(data::long_running_aps_type::iterator p=d->long_running_aps.begin();p!=d->long_running_aps.end();++p){
+	for(_data::long_running_aps_type::iterator p=d->long_running_aps.begin();p!=d->long_running_aps.end();++p){
 		if(!matched(*p->second,script_name,path_info,m))
 			continue;
 		booster::intrusive_ptr<application> app=p->first;

src/base_view.cpp

@@ -32,12 +32,12 @@
 
 namespace cppcms {
 
-struct base_view::data {
+struct base_view::_data {
 	std::ostream *out;
 };
 
 base_view::base_view(std::ostream &out) :
-	d(new data)
+	d(new _data)
 {
 	d->out=&out;
 }

src/cache_interface.cpp

@@ -50,7 +50,7 @@ namespace {
 	}
 }
 
-struct cache_interface::data {};
+struct cache_interface::_data {};
 
 cache_interface::cache_interface(http::context &context) :
 	context_(&context),

src/cache_pool.cpp

@@ -26,12 +26,12 @@
 
 namespace cppcms {
 
-struct cache_pool::data {
+struct cache_pool::_data {
 	booster::intrusive_ptr<impl::base_cache> module;
 };
 
 cache_pool::cache_pool(json::value const &settings) :
-	d(new data())
+	d(new _data())
 {
 	std::string type = settings.get("cache.backend","none");
 	if(type=="thread_shared") {

src/connection_forwarder.cpp

@@ -138,7 +138,7 @@ namespace cppcms {
 		};
 	} // impl
 
-	struct connection_forwarder::data {};
+	struct connection_forwarder::_data {};
 
 	connection_forwarder::connection_forwarder(cppcms::service &srv,std::string const &ip,int port) :
 		application(srv),

src/filters.cpp

@@ -88,7 +88,7 @@ namespace cppcms { namespace filters {
 
 ///////////////////////////////////
 	
-	struct to_upper::data {};
+	struct to_upper::_data {};
 	to_upper::to_upper() {}
 	to_upper::~to_upper() {}
 	to_upper::to_upper(to_upper const &other) : obj_(other.obj_) {}
@@ -101,7 +101,7 @@ namespace cppcms { namespace filters {
 		out << ::cppcms::locale::to_upper( tmp,loc);
 	}
 
-	struct to_lower::data {};
+	struct to_lower::_data {};
 	to_lower::to_lower() {}
 	to_lower::~to_lower() {}
 	to_lower::to_lower(to_lower const &other) : obj_(other.obj_) {}
@@ -114,7 +114,7 @@ namespace cppcms { namespace filters {
 
 	#ifndef CPPCMS_DISABLE_ICU_LOCALIZATION
 
-	struct to_title::data {};
+	struct to_title::_data {};
 	to_title::to_title() {}
 	to_title::~to_title() {}
 	to_title::to_title(to_title const &other) : obj_(other.obj_) {}
@@ -127,7 +127,7 @@ namespace cppcms { namespace filters {
 
 	#endif
 
-	struct escape::data {};
+	struct escape::_data {};
 	escape::escape() {}
 	escape::~escape() {}
 	escape::escape(escape const &other) : obj_(other.obj_) {}
@@ -138,7 +138,7 @@ namespace cppcms { namespace filters {
 		out << util::escape(obj_.get(out));
 	}
 
-	struct urlencode::data {};
+	struct urlencode::_data {};
 	urlencode::urlencode() {}
 	urlencode::~urlencode() {}
 	urlencode::urlencode(urlencode const &other) : obj_(other.obj_) {}
@@ -149,7 +149,7 @@ namespace cppcms { namespace filters {
 		out << util::urlencode(obj_.get(out));
 	}
 
-	struct raw::data {};
+	struct raw::_data {};
 	raw::raw() {}
 	raw::~raw() {}
 	raw::raw(raw const &other) : obj_(other.obj_) {}
@@ -160,7 +160,7 @@ namespace cppcms { namespace filters {
 		obj_(out);
 	}
 
-	struct base64_urlencode::data {};
+	struct base64_urlencode::_data {};
 	base64_urlencode::base64_urlencode() {}
 	base64_urlencode::~base64_urlencode() {}
 	base64_urlencode::base64_urlencode(base64_urlencode const &other) : obj_(other.obj_) {}
@@ -179,9 +179,9 @@ namespace cppcms { namespace filters {
 		os<<buf;
 	}
 
-	struct date::data {};
-	struct time::data {};
-	struct datetime::data {};
+	struct date::_data {};
+	struct time::_data {};
+	struct datetime::_data {};
 
 	date::date() : time_(0) {}
 	datetime::datetime() : time_(0){}

src/form.cpp

@@ -34,7 +34,7 @@
 
 namespace cppcms {
 
-struct form_context::data {};
+struct form_context::_data {};
 
 form_context::form_context() :
 	html_type_(as_html),
@@ -106,7 +106,7 @@ base_form::~base_form()
 }
 
 // Meanwhile -- empty
-struct form::data {
+struct form::_data {
 // TOADD
 };
 
@@ -185,7 +185,7 @@ void form::attach(widgets::base_widget *subform)
 	subform->parent(this);
 }
 
-struct form::iterator::data {};
+struct form::iterator::_data {};
 
 form::iterator::iterator() : current_(0), offset_(0)
 {
@@ -282,7 +282,7 @@ namespace widgets {
 ////////////////////////////////
 
 
-struct base_widget::data {};
+struct base_widget::_data {};
 
 base_widget::base_widget() : 
 	parent_(0),
@@ -548,7 +548,7 @@ bool base_widget::validate()
 ////////////////////////////////
 
 
-struct base_text::data {};
+struct base_text::_data {};
 
 
 base_text::base_text() : low_(0),high_(-1),validate_charset_(true)
@@ -646,7 +646,7 @@ bool base_text::validate()
 /// widgets::text
 /////////////////////////////////////////////
 
-struct text::data {};
+struct text::_data {};
 
 text::~text() {}
 text::text(): base_html_input("text"), size_(-1) {}
@@ -671,7 +671,7 @@ void text::render_attributes(form_context &context)
 	}
 }
 
-struct base_html_input::data{};
+struct base_html_input::_data{};
 
 base_html_input::base_html_input(std::string const &type) : type_(type) {}
 base_html_input::~base_html_input() {}
@@ -699,7 +699,7 @@ void base_html_input::render_input(form_context &context)
 /////////////////////////////////////////////
 
 
-struct textarea::data {};
+struct textarea::_data {};
 
 textarea::textarea() : rows_(-1), cols_(-1) {}
 textarea::~textarea() {}
@@ -740,7 +740,7 @@ void textarea::render_input(form_context &context)
 ////////////////////////
 /// Password widget  ///
 ////////////////////////
-struct password::data {};
+struct password::_data {};
 
 password::password() : text("password"), password_to_check_(0)
 {
@@ -773,7 +773,7 @@ bool password::validate()
 }
 
 
-struct regex_field::data {};
+struct regex_field::_data {};
 regex_field::regex_field() {}
 regex_field::regex_field(booster::regex const &e) : expression_(e) {}
 regex_field::regex_field(std::string const &e) : expression_(e) {}
@@ -792,12 +792,12 @@ bool regex_field::validate()
 	return valid();
 }
 
-struct email::data {};
+struct email::_data {};
 email::email() : regex_field("^[^@]+@[^@]+$") {}
 email::~email() {}
 
 
-struct checkbox::data {};
+struct checkbox::_data {};
 
 checkbox::checkbox(std::string const &type) : 
 	base_html_input(type),
@@ -863,7 +863,7 @@ void checkbox::load(http::context &context)
 	}
 }
 
-struct select_multiple::data{};
+struct select_multiple::_data{};
 
 
 select_multiple::element::element():
@@ -1051,8 +1051,8 @@ void select_multiple::rows(unsigned v)
 // Select base
 ///////////////////
 
-struct select_base::data {};
-struct select_base::element::data {};
+struct select_base::_data {};
+struct select_base::element::_data {};
 select_base::element::element() : need_translation(0)
 {
 }
@@ -1185,7 +1185,7 @@ void select_base::load(http::context &context)
 /// select
 ///////////////////
 
-struct select::data {};
+struct select::_data {};
 
 select::select() {}
 select::~select() {}
@@ -1223,7 +1223,7 @@ void select::render_input(form_context &context)
 /// Radio
 /////////////////////////
 
-struct radio::data {};
+struct radio::_data {};
 
 radio::radio() : vertical_(1)
 {
@@ -1297,7 +1297,7 @@ void radio::render_input(form_context &context)
 // Submit
 ////////////////
 
-struct submit::data {};
+struct submit::_data {};
 submit::submit() : 
 	base_html_input("submit"),
 	pressed_(false)

src/http_context.cpp

@@ -43,14 +43,14 @@
 namespace cppcms {
 namespace http {
 
-	struct context::data {
+	struct context::_data {
 		std::locale locale;
 		std::string skin;
 		http::request request;
 		std::auto_ptr<http::response> response;
 		std::auto_ptr<cache_interface> cache;
 		std::auto_ptr<session_interface> session;
-		data(context &cntx) :
+		_data(context &cntx) :
 			locale(cntx.connection().service().locale()),
 			request(cntx.connection())
 		{
@@ -60,7 +60,7 @@ namespace http {
 context::context(booster::shared_ptr<impl::cgi::connection> conn) :
 	conn_(conn)
 {
-	d.reset(new data(*this));
+	d.reset(new _data(*this));
 	d->response.reset(new http::response(*this));
 	skin(service().views_pool().default_skin());
 	d->cache.reset(new cache_interface(*this));

src/http_cookie.cpp

@@ -26,7 +26,7 @@
 
 namespace cppcms { namespace http {
 
-struct cookie::data { };
+struct cookie::_data { };
 
 std::string cookie::name() const { return name_; }
 void cookie::name(std::string v) { name_=v; }

src/http_file.cpp

@@ -41,7 +41,7 @@ size_t file::size() const
 	return size_;
 }
 
-std::istream &file::data()
+std::istream &file::_data()
 {
 	if(saved_in_file_)
 		return file_;

src/http_request.cpp

@@ -123,7 +123,7 @@ bool request::parse_cookies()
 }
 
 
-struct request::data {
+struct request::_data {
 	std::vector<booster::shared_ptr<file> > files;
 	std::vector<char> post_data;
 };
@@ -184,7 +184,7 @@ std::pair<void *,size_t> request::raw_post_data()
 }
 
 request::request(impl::cgi::connection &conn) :
-	d(new data),
+	d(new _data),
 	conn_(&conn)
 {
 }

src/http_response.cpp

@@ -83,7 +83,7 @@ namespace  {
 	};
 }
 
-struct response::data {
+struct response::_data {
 	typedef bool (*compare_type)(std::string const &left,std::string const &right);
 	typedef std::map<std::string,std::string,compare_type> headers_type;
 	headers_type headers;
@@ -93,7 +93,7 @@ struct response::data {
 	boost::iostreams::stream<output_device> output;
 	boost::iostreams::filtering_ostream filter;
 
-	data(impl::cgi::connection *conn) : 
+	_data(impl::cgi::connection *conn) : 
 		headers(string_i_comp),
 		output(output_device(conn),conn->service().settings().get("service.output_buffer_size",16384))
 	{
@@ -102,7 +102,7 @@ struct response::data {
 
 
 response::response(context &context) :
-	d(new data(&context.connection())),
+	d(new _data(&context.connection())),
 	context_(context),
 	stream_(0),
 	io_mode_(normal),
@@ -172,7 +172,7 @@ void response::finalize()
 
 std::string response::get_header(std::string const &name)
 {
-	data::headers_type::const_iterator p=d->headers.find(name);
+	_data::headers_type::const_iterator p=d->headers.find(name);
 	if(p!=d->headers.end())
 		return p->second;
 	return std::string();
@@ -219,7 +219,7 @@ void response::write_http_headers(std::ostream &out)
 {
 	context_.session().save();
 
-	for(data::headers_type::const_iterator h=d->headers.begin();h!=d->headers.end();++h) {
+	for(_data::headers_type::const_iterator h=d->headers.begin();h!=d->headers.end();++h) {
 		out<<h->first<<": "<<h->second<<"\r\n";
 	}
 	for(unsigned i=0;i<d->cookies.size();i++) {

src/json.cpp

@@ -79,7 +79,7 @@ namespace json {
 			json::array
 		>  variant_type;
 
-	struct value::data {
+	struct value::_data {
 	public:
 		variant_type &value()
 		{
@@ -97,7 +97,7 @@ namespace json {
 	using namespace std;
 	
 	value::copyable::copyable() :
-		d(new value::data()) 
+		d(new value::_data()) 
 	{
 	}
 	value::copyable::~copyable()

src/rpc_json.cpp

@@ -30,7 +30,7 @@ namespace cppcms {
 namespace rpc {
 
     call_error::call_error(std::string const &m) : cppcms_error(m) {} 
-	struct json_call::data {};
+	struct json_call::_data {};
 
 	json_call::json_call(http::context &c) 
 	{
@@ -122,7 +122,7 @@ namespace rpc {
 		context_ = c;
 	}
 	
-	struct json_rpc_server::data{};
+	struct json_rpc_server::_data{};
 
 	json_rpc_server::json_rpc_server(cppcms::service &srv) :
 		application(srv)

src/session_cookies.cpp

@@ -28,7 +28,7 @@ namespace sessions {
 
 using namespace std;
 
-struct session_cookies::data {};
+struct session_cookies::_data {};
 
 session_cookies::session_cookies(std::auto_ptr<encryptor> enc) :
 	encryptor_(enc)

src/session_dual.cpp

@@ -27,7 +27,7 @@ using namespace std;
 namespace cppcms {
 namespace sessions {
 
-struct session_dual::data {};
+struct session_dual::_data {};
 
 session_dual::session_dual(std::auto_ptr<encryptor> enc,booster::shared_ptr<session_storage> storage,size_t limit) :
 	client_(new session_cookies(enc)),

src/session_interface.cpp

@@ -36,7 +36,7 @@ using namespace std;
 
 namespace cppcms {
 
-	struct session_interface::data {};
+	struct session_interface::_data {};
 
 	struct session_interface::entry {
 		std::string value;

src/session_memory_storage.cpp

@@ -34,12 +34,12 @@ namespace sessions {
 
 class session_memory_storage : public session_storage {
 	typedef std::multimap<time_t,std::string> timeout_type;
-	struct data {
+	struct _data {
 		time_t timeout;
 		std::string info;
 		timeout_type::iterator timeout_ptr;
 	};
-	typedef boost::unordered_map<std::string,data> map_type;
+	typedef boost::unordered_map<std::string,_data> map_type;
 	map_type map_;
 	timeout_type timeout_;
 	booster::shared_mutex mutex_;
@@ -50,7 +50,7 @@ public:
 		booster::unique_lock<booster::shared_mutex> lock(mutex_);
 		map_type::iterator p=map_.find(key);
 		if(p==map_.end()) {
-			data &d=map_[key];
+			_data &d=map_[key];
 			d.timeout=to;
 			d.info=value;
 			d.timeout_ptr=timeout_.insert(std::pair<time_t,std::string>(to,key));

src/session_pool.cpp

@@ -52,7 +52,7 @@
 
 
 namespace cppcms {
-struct session_pool::data 
+struct session_pool::_data 
 {
 };
 

src/session_posix_file_storage.cpp

@@ -49,7 +49,7 @@
 namespace cppcms {
 namespace sessions {
 
-struct session_file_storage::data {};
+struct session_file_storage::_data {};
 
 using namespace cppcms::impl;
 
@@ -371,7 +371,7 @@ void session_file_storage::gc()
 	}
 }
 
-struct session_file_storage_factory::data {};
+struct session_file_storage_factory::_data {};
 
 session_file_storage_factory::session_file_storage_factory(std::string path,int conc,int proc_no,bool force_lock) :
 	storage_(new session_file_storage(path,conc,proc_no,force_lock))

src/session_sid.cpp

@@ -109,7 +109,7 @@ namespace impl {
 
 
 
-struct session_sid::data {};
+struct session_sid::_data {};
 
 session_sid::session_sid(booster::shared_ptr<session_storage> st) :
 	storage_(st)

src/session_win32_file_storage.cpp

@@ -39,7 +39,7 @@
 namespace cppcms {
 namespace sessions {
 
-struct session_file_storage::data {};
+struct session_file_storage::_data {};
 
 session_file_storage::session_file_storage(std::string path)
 {
@@ -250,7 +250,7 @@ void session_file_storage::gc()
 	}
 }
 
-struct session_file_storage_factory::data {};
+struct session_file_storage_factory::_data {};
 
 session_file_storage_factory::session_file_storage_factory(std::string path) :
 	storage_(new session_file_storage(path))

src/tcp_cache_server.cpp

@@ -366,7 +366,7 @@ static void thread_function(io::io_service *io)
 	io->stop();
 }
 
-struct tcp_cache_service::data {
+struct tcp_cache_service::_data {
 	io::io_service io;
 	std::auto_ptr<server> srv_cache;
 	booster::intrusive_ptr<base_cache> cache;
@@ -374,7 +374,7 @@ struct tcp_cache_service::data {
 };
 
 tcp_cache_service::tcp_cache_service(booster::intrusive_ptr<base_cache> cache,int threads,std::string ip,int port) :
-	d(new data)
+	d(new _data)
 {
 	d->cache=cache;
 	d->srv_cache.reset(new server(d->io,ip,port,*cache));

src/urandom.cpp

@@ -28,13 +28,13 @@
 
 namespace cppcms {
 
-	struct urandom_device::data {
+	struct urandom_device::_data {
 		HCRYPTPROV provider;
 		data() : provider(0) {}
 	};
 
 	urandom_device::urandom_device() :
-		d(new data())
+		d(new _data())
 	{
 		if(CryptAcquireContext(&d->provider,0,0,PROV_RSA_FULL,0)) 
 			return;
@@ -68,7 +68,7 @@ namespace cppcms {
 #include <fstream>
 
 namespace cppcms {
-	struct urandom_device::data {};
+	struct urandom_device::_data {};
 
 	urandom_device::urandom_device()
 	{

src/url_dispatcher.cpp

@@ -121,14 +121,14 @@ namespace cppcms {
 	} // anonynoys
 
 
-	struct url_dispatcher::data {
+	struct url_dispatcher::_data {
 		std::vector<booster::shared_ptr<option> > options;
 		booster::shared_ptr<option> last_option;
 	};
 
 	// Meanwhile nothing
 	url_dispatcher::url_dispatcher() :
-			d(new url_dispatcher::data())
+			d(new url_dispatcher::_data())
 	{
 	}
 	url_dispatcher::~url_dispatcher()

src/views_pool.cpp

@@ -204,7 +204,7 @@ private:
 
 };
 
-struct views_pool::data {
+struct views_pool::_data {
 	bool dynamic_reload;
 	typedef std::map<std::string,skin> skins_type;
 	skins_type skins;
@@ -214,7 +214,7 @@ struct views_pool::data {
 };
 
 views_pool::views_pool() :
-	d(new data())
+	d(new _data())
 {
 }
 
@@ -224,7 +224,7 @@ std::string views_pool::default_skin() const
 }
 
 views_pool::views_pool(json::value const &settings) :
-	d(new data())
+	d(new _data())
 {
 	d->skins=static_instance().d->skins;
 	std::vector<std::string> paths=settings.get("views.paths",std::vector<std::string>());
@@ -261,7 +261,7 @@ void views_pool::render(std::string skin_name,std::string template_name,std::ost
 		for(;;){
 			{	// Check if update
 				booster::shared_lock<booster::shared_mutex> lock(d->lock_);
-				data::skins_type::const_iterator p=d->skins.find(skin_name);
+				_data::skins_type::const_iterator p=d->skins.find(skin_name);
 				if(p==d->skins.end())
 					throw cppcms_error("There is no such skin:" + skin_name);
 				if(p->second.is_updated()) {
@@ -271,7 +271,7 @@ void views_pool::render(std::string skin_name,std::string template_name,std::ost
 			}
 			{	// Reload
 				booster::unique_lock<booster::shared_mutex> lock(d->lock_);
-				data::skins_type::iterator p=d->skins.find(skin_name);
+				_data::skins_type::iterator p=d->skins.find(skin_name);
 				if(p==d->skins.end())
 					throw cppcms_error("There is no such skin:" + skin_name);
 				if(!p->second.is_updated()) {
@@ -292,7 +292,7 @@ void views_pool::render(std::string skin_name,std::string template_name,std::ost
 		}
 	}
 	else {	// No need to reload
-		data::skins_type::const_iterator p=d->skins.find(skin_name);
+		_data::skins_type::const_iterator p=d->skins.find(skin_name);
 		if(p==d->skins.end())
 			throw cppcms_error("There is no such skin:" + skin_name);
 		p->second.render(template_name,out,content);
@@ -305,7 +305,7 @@ views_pool::~views_pool()
 
 void views_pool::add_view(std::string name,mapping_type const &mapping)
 {
-	data::skins_type::iterator p=d->skins.find(name);
+	_data::skins_type::iterator p=d->skins.find(name);
 	if(p!=d->skins.end())
 		throw cppcms_error("Skin " + name + "can't be loaded twice");
 	d->skins[name]=skin(name,mapping);