acceptor.h		acceptor.h
	//		//
	// Copyright (c) 2010 Artyom Beilis (Tonkikh)		// Copyright (C) 2009-2012 Artyom Beilis (Tonkikh)
	//		//
	// Distributed under the Boost Software License, Version 1.0. (See		// Distributed under the Boost Software License, Version 1.0. (See
	// accompanying file LICENSE_1_0.txt or copy at		// accompanying file LICENSE_1_0.txt or copy at
	// http://www.boost.org/LICENSE_1_0.txt)		// http://www.boost.org/LICENSE_1_0.txt)
	//		//
	#ifndef BOOSTER_AIO_ACCEPTOR_H		#ifndef BOOSTER_AIO_ACCEPTOR_H
	#define BOOSTER_AIO_ACCEPTOR_H		#define BOOSTER_AIO_ACCEPTOR_H
	#include <booster/aio/types.h>		#include <booster/aio/types.h>
	#include <booster/callback.h>		#include <booster/callback.h>
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	aio_category.h		aio_category.h
	//		//
	// Copyright (c) 2010 Artyom Beilis (Tonkikh)		// Copyright (C) 2009-2012 Artyom Beilis (Tonkikh)
	//		//
	// Distributed under the Boost Software License, Version 1.0. (See		// Distributed under the Boost Software License, Version 1.0. (See
	// accompanying file LICENSE_1_0.txt or copy at		// accompanying file LICENSE_1_0.txt or copy at
	// http://www.boost.org/LICENSE_1_0.txt)		// http://www.boost.org/LICENSE_1_0.txt)
	//		//
	#ifndef BOOSTER_ERROR_CATEGORY_H		#ifndef BOOSTER_ERROR_CATEGORY_H
	#define BOOSTER_ERROR_CATEGORY_H		#define BOOSTER_ERROR_CATEGORY_H
	#include <booster/system_error.h>		#include <booster/system_error.h>
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	aio_config.h		aio_config.h
	//		//
	// Copyright (c) 2010 Artyom Beilis (Tonkikh)		// Copyright (C) 2009-2012 Artyom Beilis (Tonkikh)
	//		//
	// Distributed under the Boost Software License, Version 1.0. (See		// Distributed under the Boost Software License, Version 1.0. (See
	// accompanying file LICENSE_1_0.txt or copy at		// accompanying file LICENSE_1_0.txt or copy at
	// http://www.boost.org/LICENSE_1_0.txt)		// http://www.boost.org/LICENSE_1_0.txt)
	//		//
	#ifndef BOOSTER_AIO_CONFIG_H		#ifndef BOOSTER_AIO_CONFIG_H
	#define BOOSTER_AIO_CONFIG_H		#define BOOSTER_AIO_CONFIG_H
	#include <booster/config.h>		#include <booster/config.h>
	#include <booster/build_config.h>		#include <booster/build_config.h>
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	application.h		application.h
	/////////////////////////////////////////////////////////////////////////// ////		/////////////////////////////////////////////////////////////////////////// ////
	//		//
	// Copyright (C) 2008-2010 Artyom Beilis (Tonkikh) <artyomtnk@yahoo.com>		// Copyright (C) 2008-2012 Artyom Beilis (Tonkikh) <artyomtnk@yahoo.com>
	//
	// This program is free software: you can redistribute it and/or modify
	// it under the terms of the GNU Lesser General Public License as publishe
	d by
	// the Free Software Foundation, either version 3 of the License, or
	// (at your option) any later version.
	//
	// This program is distributed in the hope that it will be useful,
	// but WITHOUT ANY WARRANTY; without even the implied warranty of
	// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
	// GNU Lesser General Public License for more details.
	//		//
	// You should have received a copy of the GNU Lesser General Public Licens		// See accompanying file COPYING.TXT file for licensing details.
	e
	// along with this program. If not, see <http://www.gnu.org/licenses/>.
	//		//
	/////////////////////////////////////////////////////////////////////////// ////		/////////////////////////////////////////////////////////////////////////// ////
	#ifndef CPPCMS_APPLICATION_H		#ifndef CPPCMS_APPLICATION_H
	#define CPPCMS_APPLICATION_H		#define CPPCMS_APPLICATION_H
	#include <cppcms/defs.h>		#include <cppcms/defs.h>
	#include <booster/noncopyable.h>		#include <booster/noncopyable.h>
	#include <booster/hold_ptr.h>		#include <booster/hold_ptr.h>
	#include <booster/atomic_counter.h>		#include <booster/atomic_counter.h>
	#include <booster/intrusive_ptr.h>		#include <booster/intrusive_ptr.h>
End of changes. 2 change blocks.
	15 lines changed or deleted		2 lines changed or added

	applications_pool.h		applications_pool.h
	/////////////////////////////////////////////////////////////////////////// ////		/////////////////////////////////////////////////////////////////////////// ////
	//		//
	// Copyright (C) 2008-2010 Artyom Beilis (Tonkikh) <artyomtnk@yahoo.com>		// Copyright (C) 2008-2012 Artyom Beilis (Tonkikh) <artyomtnk@yahoo.com>
	//
	// This program is free software: you can redistribute it and/or modify
	// it under the terms of the GNU Lesser General Public License as publishe
	d by
	// the Free Software Foundation, either version 3 of the License, or
	// (at your option) any later version.
	//
	// This program is distributed in the hope that it will be useful,
	// but WITHOUT ANY WARRANTY; without even the implied warranty of
	// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
	// GNU Lesser General Public License for more details.
	//		//
	// You should have received a copy of the GNU Lesser General Public Licens		// See accompanying file COPYING.TXT file for licensing details.
	e
	// along with this program. If not, see <http://www.gnu.org/licenses/>.
	//		//
	/////////////////////////////////////////////////////////////////////////// ////		/////////////////////////////////////////////////////////////////////////// ////
	#ifndef CPPCMS_APPLICATIONS_POOL_H		#ifndef CPPCMS_APPLICATIONS_POOL_H
	#define CPPCMS_APPLICATIONS_POOL_H		#define CPPCMS_APPLICATIONS_POOL_H
	#include <cppcms/defs.h>		#include <cppcms/defs.h>
	#include <booster/noncopyable.h>		#include <booster/noncopyable.h>
	#include <booster/hold_ptr.h>		#include <booster/hold_ptr.h>
	#include <booster/intrusive_ptr.h>		#include <booster/intrusive_ptr.h>
End of changes. 2 change blocks.
	15 lines changed or deleted		2 lines changed or added

	archive_traits.h		archive_traits.h
	/////////////////////////////////////////////////////////////////////////// ////		/////////////////////////////////////////////////////////////////////////// ////
	//		//
	// Copyright (C) 2008-2010 Artyom Beilis (Tonkikh) <artyomtnk@yahoo.com>		// Copyright (C) 2008-2012 Artyom Beilis (Tonkikh) <artyomtnk@yahoo.com>
	//
	// This program is free software: you can redistribute it and/or modify
	// it under the terms of the GNU Lesser General Public License as publishe
	d by
	// the Free Software Foundation, either version 3 of the License, or
	// (at your option) any later version.
	//
	// This program is distributed in the hope that it will be useful,
	// but WITHOUT ANY WARRANTY; without even the implied warranty of
	// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
	// GNU Lesser General Public License for more details.
	//		//
	// You should have received a copy of the GNU Lesser General Public Licens		// See accompanying file COPYING.TXT file for licensing details.
	e
	// along with this program. If not, see <http://www.gnu.org/licenses/>.
	//		//
	/////////////////////////////////////////////////////////////////////////// ////		/////////////////////////////////////////////////////////////////////////// ////
	#ifndef CPPCMS_ARCHIVE_TRAITS_H		#ifndef CPPCMS_ARCHIVE_TRAITS_H
	#define CPPCMS_ARCHIVE_TRAITS_H		#define CPPCMS_ARCHIVE_TRAITS_H
	#include <cppcms/serialization_classes.h>		#include <cppcms/serialization_classes.h>
	#include <cppcms/json.h>		#include <cppcms/json.h>
	#include <booster/shared_ptr.h>		#include <booster/shared_ptr.h>
	#include <booster/intrusive_ptr.h>		#include <booster/intrusive_ptr.h>
End of changes. 2 change blocks.
	15 lines changed or deleted		2 lines changed or added

	assert.h		assert.h
	//		//
	// Copyright (c) 2010 Artyom Beilis (Tonkikh)		// Copyright (C) 2009-2012 Artyom Beilis (Tonkikh)
	//		//
	// Distributed under the Boost Software License, Version 1.0. (See		// Distributed under the Boost Software License, Version 1.0. (See
	// accompanying file LICENSE_1_0.txt or copy at		// accompanying file LICENSE_1_0.txt or copy at
	// http://www.boost.org/LICENSE_1_0.txt)		// http://www.boost.org/LICENSE_1_0.txt)
	//		//
	#ifndef BOOSTER_ASSERT_H		#ifndef BOOSTER_ASSERT_H
	#define BOOSTER_ASSERT_H		#define BOOSTER_ASSERT_H
	#include <assert.h>		#include <assert.h>
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	atomic_counter.h		atomic_counter.h
	//		//
	// Copyright (c) 2010 Artyom Beilis (Tonkikh)		// Copyright (C) 2009-2012 Artyom Beilis (Tonkikh)
	//		//
	// Distributed under the Boost Software License, Version 1.0. (See		// Distributed under the Boost Software License, Version 1.0. (See
	// accompanying file LICENSE_1_0.txt or copy at		// accompanying file LICENSE_1_0.txt or copy at
	// http://www.boost.org/LICENSE_1_0.txt)		// http://www.boost.org/LICENSE_1_0.txt)
	//		//
	#ifndef BOOSTER_ATOMIC_COUNT_H		#ifndef BOOSTER_ATOMIC_COUNT_H
	#define BOOSTER_ATOMIC_COUNT_H		#define BOOSTER_ATOMIC_COUNT_H
	#include <booster/config.h>		#include <booster/config.h>
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	backtrace.h		backtrace.h
	//		//
	// Copyright (c) 2010 Artyom Beilis (Tonkikh)		// Copyright (C) 2009-2012 Artyom Beilis (Tonkikh)
	//		//
	// Distributed under the Boost Software License, Version 1.0. (See		// Distributed under the Boost Software License, Version 1.0. (See
	// accompanying file LICENSE_1_0.txt or copy at		// accompanying file LICENSE_1_0.txt or copy at
	// http://www.boost.org/LICENSE_1_0.txt)		// http://www.boost.org/LICENSE_1_0.txt)
	//		//
	#ifndef BOOSTER_BACKTRACE_H		#ifndef BOOSTER_BACKTRACE_H
	#define BOOSTER_BACKTRACE_H		#define BOOSTER_BACKTRACE_H
	#include <booster/config.h>		#include <booster/config.h>
	#include <stdexcept>		#include <stdexcept>
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	base64.h		base64.h
	/////////////////////////////////////////////////////////////////////////// ////		/////////////////////////////////////////////////////////////////////////// ////
	//		//
	// Copyright (C) 2008-2010 Artyom Beilis (Tonkikh) <artyomtnk@yahoo.com>		// Copyright (C) 2008-2012 Artyom Beilis (Tonkikh) <artyomtnk@yahoo.com>
	//
	// This program is free software: you can redistribute it and/or modify
	// it under the terms of the GNU Lesser General Public License as publishe
	d by
	// the Free Software Foundation, either version 3 of the License, or
	// (at your option) any later version.
	//
	// This program is distributed in the hope that it will be useful,
	// but WITHOUT ANY WARRANTY; without even the implied warranty of
	// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
	// GNU Lesser General Public License for more details.
	//		//
	// You should have received a copy of the GNU Lesser General Public Licens		// See accompanying file COPYING.TXT file for licensing details.
	e
	// along with this program. If not, see <http://www.gnu.org/licenses/>.
	//		//
	/////////////////////////////////////////////////////////////////////////// ////		/////////////////////////////////////////////////////////////////////////// ////
	#ifndef CPPCMS_BASE64_H		#ifndef CPPCMS_BASE64_H
	#define CPPCMS_BASE64_H		#define CPPCMS_BASE64_H
	#include <cppcms/defs.h>		#include <cppcms/defs.h>
	#include <string>		#include <string>
	#include <iosfwd>		#include <iosfwd>
	namespace cppcms {		namespace cppcms {
End of changes. 2 change blocks.
	15 lines changed or deleted		2 lines changed or added

	base_cache_fwd.h		base_cache_fwd.h
	/////////////////////////////////////////////////////////////////////////// ////		/////////////////////////////////////////////////////////////////////////// ////
	//		//
	// Copyright (C) 2008-2010 Artyom Beilis (Tonkikh) <artyomtnk@yahoo.com>		// Copyright (C) 2008-2012 Artyom Beilis (Tonkikh) <artyomtnk@yahoo.com>
	//
	// This program is free software: you can redistribute it and/or modify
	// it under the terms of the GNU Lesser General Public License as publishe
	d by
	// the Free Software Foundation, either version 3 of the License, or
	// (at your option) any later version.
	//
	// This program is distributed in the hope that it will be useful,
	// but WITHOUT ANY WARRANTY; without even the implied warranty of
	// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
	// GNU Lesser General Public License for more details.
	//		//
	// You should have received a copy of the GNU Lesser General Public Licens		// See accompanying file COPYING.TXT file for licensing details.
	e
	// along with this program. If not, see <http://www.gnu.org/licenses/>.
	//		//
	/////////////////////////////////////////////////////////////////////////// ////		/////////////////////////////////////////////////////////////////////////// ////
	#ifndef CPPCMS_BASE_CACHE_FWD_H		#ifndef CPPCMS_BASE_CACHE_FWD_H
	#define CPPCMS_BASE_CACHE_FWD_H		#define CPPCMS_BASE_CACHE_FWD_H
	#include <string>		#include <string>
	#include <set>		#include <set>
	#include <cppcms/defs.h>		#include <cppcms/defs.h>
	#include <booster/intrusive_ptr.h>		#include <booster/intrusive_ptr.h>
	#include <cppcms/cstdint.h>		#include <cppcms/cstdint.h>
End of changes. 2 change blocks.
	15 lines changed or deleted		2 lines changed or added

	base_content.h		base_content.h
	/////////////////////////////////////////////////////////////////////////// ////		/////////////////////////////////////////////////////////////////////////// ////
	//		//
	// Copyright (C) 2008-2010 Artyom Beilis (Tonkikh) <artyomtnk@yahoo.com>		// Copyright (C) 2008-2012 Artyom Beilis (Tonkikh) <artyomtnk@yahoo.com>
	//
	// This program is free software: you can redistribute it and/or modify
	// it under the terms of the GNU Lesser General Public License as publishe
	d by
	// the Free Software Foundation, either version 3 of the License, or
	// (at your option) any later version.
	//
	// This program is distributed in the hope that it will be useful,
	// but WITHOUT ANY WARRANTY; without even the implied warranty of
	// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
	// GNU Lesser General Public License for more details.
	//		//
	// You should have received a copy of the GNU Lesser General Public Licens		// See accompanying file COPYING.TXT file for licensing details.
	e
	// along with this program. If not, see <http://www.gnu.org/licenses/>.
	//		//
	/////////////////////////////////////////////////////////////////////////// ////		/////////////////////////////////////////////////////////////////////////// ////
	#ifndef CPPCMS_BASE_CONTENT_H		#ifndef CPPCMS_BASE_CONTENT_H
	#define CPPCMS_BASE_CONTENT_H		#define CPPCMS_BASE_CONTENT_H
	#include <cppcms/defs.h>		#include <cppcms/defs.h>
	#include <booster/copy_ptr.h>		#include <booster/copy_ptr.h>
	namespace cppcms {		namespace cppcms {
	skipping to change at line 58		skipping to change at line 47
	/// Set the application that renders current		/// Set the application that renders current
	///		///
	/// Called automatically by application::render		/// Called automatically by application::render
	///		///
	void app(application &app);		void app(application &app);
	///		///
	/// Resets the application		/// Resets the application
	///		///
	void reset_app();		void reset_app();
			///
			/// Returns true of the application is assigned
			///
			bool has_app();
			///
			/// \brief Special guard class that allows setting and reset
			ting
			/// content's rendeding according to the specific scope
			///
			class app_guard {
			app_guard(app_guard const &);
			void operator=(app_guard const &);
			public:
			///
			/// Initialize set the applicaton \a to a content \a
			c if have
			/// not one ready
			///
			app_guard(base_content &c,application &a) : p_(0)
			{
			if(!c.has_app()) {
			p_=&c;
			c.app(a);
			}
			}
			///
			/// Assign the application to \a c from the \a paren
			t's application.
			///
			/// It is assigned if it is not already defined
			///
			app_guard(base_content &c,base_content &parent) : p_
			(0)
			{
			if(!c.has_app() && parent.has_app()) {
			p_ = &c;
			c.app(parent.app());
			}
			}
			///
			/// Reset the application if the content if it was a
			ssigned in constructor
			///
			~app_guard()
			{
			if(p_) {
			p_->reset_app();
			p_ = 0;
			}
			}
			private:
			base_content *p_;
			};
	private:		private:
	struct _data;		struct _data;
	booster::copy_ptr<_data> d;		booster::copy_ptr<_data> d;
	application *app_;		application *app_;
	};		};
	}		}
	#endif		#endif
End of changes. 3 change blocks.
	15 lines changed or deleted		56 lines changed or added

	base_view.h		base_view.h
	/////////////////////////////////////////////////////////////////////////// ////		/////////////////////////////////////////////////////////////////////////// ////
	//		//
	// Copyright (C) 2008-2010 Artyom Beilis (Tonkikh) <artyomtnk@yahoo.com>		// Copyright (C) 2008-2012 Artyom Beilis (Tonkikh) <artyomtnk@yahoo.com>
	//
	// This program is free software: you can redistribute it and/or modify
	// it under the terms of the GNU Lesser General Public License as publishe
	d by
	// the Free Software Foundation, either version 3 of the License, or
	// (at your option) any later version.
	//
	// This program is distributed in the hope that it will be useful,
	// but WITHOUT ANY WARRANTY; without even the implied warranty of
	// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
	// GNU Lesser General Public License for more details.
	//		//
	// You should have received a copy of the GNU Lesser General Public Licens		// See accompanying file COPYING.TXT file for licensing details.
	e
	// along with this program. If not, see <http://www.gnu.org/licenses/>.
	//		//
	/////////////////////////////////////////////////////////////////////////// ////		/////////////////////////////////////////////////////////////////////////// ////
	#ifndef CPPCMS_BASE_VIEW_H		#ifndef CPPCMS_BASE_VIEW_H
	#define CPPCMS_BASE_VIEW_H		#define CPPCMS_BASE_VIEW_H
	#include <cppcms/defs.h>		#include <cppcms/defs.h>
	#include <ostream>		#include <ostream>
	#include <sstream>		#include <sstream>
	#include <string>		#include <string>
End of changes. 2 change blocks.
	15 lines changed or deleted		2 lines changed or added

	basic_io_device.h		basic_io_device.h
	//		//
	// Copyright (c) 2010 Artyom Beilis (Tonkikh)		// Copyright (C) 2009-2012 Artyom Beilis (Tonkikh)
	//		//
	// Distributed under the Boost Software License, Version 1.0. (See		// Distributed under the Boost Software License, Version 1.0. (See
	// accompanying file LICENSE_1_0.txt or copy at		// accompanying file LICENSE_1_0.txt or copy at
	// http://www.boost.org/LICENSE_1_0.txt)		// http://www.boost.org/LICENSE_1_0.txt)
	//		//
	#ifndef BOOSTER_AIO_BASIC_IO_DEVICE_H		#ifndef BOOSTER_AIO_BASIC_IO_DEVICE_H
	#define BOOSTER_AIO_BASIC_IO_DEVICE_H		#define BOOSTER_AIO_BASIC_IO_DEVICE_H
	#include <booster/aio/types.h>		#include <booster/aio/types.h>
	#include <booster/hold_ptr.h>		#include <booster/hold_ptr.h>
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	basic_socket.h		basic_socket.h
	//		//
	// Copyright (c) 2010 Artyom Beilis (Tonkikh)		// Copyright (C) 2009-2012 Artyom Beilis (Tonkikh)
	//		//
	// Distributed under the Boost Software License, Version 1.0. (See		// Distributed under the Boost Software License, Version 1.0. (See
	// accompanying file LICENSE_1_0.txt or copy at		// accompanying file LICENSE_1_0.txt or copy at
	// http://www.boost.org/LICENSE_1_0.txt)		// http://www.boost.org/LICENSE_1_0.txt)
	//		//
	#ifndef BOOSTER_AIO_BASIC_SOCKET_H		#ifndef BOOSTER_AIO_BASIC_SOCKET_H
	#define BOOSTER_AIO_BASIC_SOCKET_H		#define BOOSTER_AIO_BASIC_SOCKET_H
	#include <booster/aio/types.h>		#include <booster/aio/types.h>
	#include <booster/hold_ptr.h>		#include <booster/hold_ptr.h>
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	buffer.h		buffer.h
	//		//
	// Copyright (c) 2010 Artyom Beilis (Tonkikh)		// Copyright (C) 2009-2012 Artyom Beilis (Tonkikh)
	//		//
	// Distributed under the Boost Software License, Version 1.0. (See		// Distributed under the Boost Software License, Version 1.0. (See
	// accompanying file LICENSE_1_0.txt or copy at		// accompanying file LICENSE_1_0.txt or copy at
	// http://www.boost.org/LICENSE_1_0.txt)		// http://www.boost.org/LICENSE_1_0.txt)
	//		//
	#ifndef BOOSTER_AIO_BUFFER_H		#ifndef BOOSTER_AIO_BUFFER_H
	#define BOOSTER_AIO_BUFFER_H		#define BOOSTER_AIO_BUFFER_H
	#include <vector>		#include <vector>
	#include <string>		#include <string>
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	build_config.h		build_config.h
	//		//
	// Copyright (c) 2010 Artyom Beilis (Tonkikh)		// Copyright (C) 2009-2012 Artyom Beilis (Tonkikh)
	//		//
	// Distributed under the Boost Software License, Version 1.0. (See		// Distributed under the Boost Software License, Version 1.0. (See
	// accompanying file LICENSE_1_0.txt or copy at		// accompanying file LICENSE_1_0.txt or copy at
	// http://www.boost.org/LICENSE_1_0.txt)		// http://www.boost.org/LICENSE_1_0.txt)
	//		//
	#ifndef BOOSTER_BUILD_CONFIG_H		#ifndef BOOSTER_BUILD_CONFIG_H
	#define BOOSTER_BUILD_CONFIG_H		#define BOOSTER_BUILD_CONFIG_H
	//		//
	// GCC's __sync_* operations		// GCC's __sync_* operations
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	cache_interface.h		cache_interface.h
	/////////////////////////////////////////////////////////////////////////// ////		/////////////////////////////////////////////////////////////////////////// ////
	//		//
	// Copyright (C) 2008-2010 Artyom Beilis (Tonkikh) <artyomtnk@yahoo.com>		// Copyright (C) 2008-2012 Artyom Beilis (Tonkikh) <artyomtnk@yahoo.com>
	//
	// This program is free software: you can redistribute it and/or modify
	// it under the terms of the GNU Lesser General Public License as publishe
	d by
	// the Free Software Foundation, either version 3 of the License, or
	// (at your option) any later version.
	//
	// This program is distributed in the hope that it will be useful,
	// but WITHOUT ANY WARRANTY; without even the implied warranty of
	// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
	// GNU Lesser General Public License for more details.
	//		//
	// You should have received a copy of the GNU Lesser General Public Licens		// See accompanying file COPYING.TXT file for licensing details.
	e
	// along with this program. If not, see <http://www.gnu.org/licenses/>.
	//		//
	/////////////////////////////////////////////////////////////////////////// ////		/////////////////////////////////////////////////////////////////////////// ////
	#ifndef CPPCMS_CACHE_INTERFACE_H		#ifndef CPPCMS_CACHE_INTERFACE_H
	#define CPPCMS_CACHE_INTERFACE_H		#define CPPCMS_CACHE_INTERFACE_H
	#include <string>		#include <string>
	#include <set>		#include <set>
	#include <cppcms/defs.h>		#include <cppcms/defs.h>
	#include <cppcms/serialization_classes.h>		#include <cppcms/serialization_classes.h>
End of changes. 2 change blocks.
	15 lines changed or deleted		2 lines changed or added

	cache_pool.h		cache_pool.h
	/////////////////////////////////////////////////////////////////////////// ////		/////////////////////////////////////////////////////////////////////////// ////
	//		//
	// Copyright (C) 2008-2010 Artyom Beilis (Tonkikh) <artyomtnk@yahoo.com>		// Copyright (C) 2008-2012 Artyom Beilis (Tonkikh) <artyomtnk@yahoo.com>
	//
	// This program is free software: you can redistribute it and/or modify
	// it under the terms of the GNU Lesser General Public License as publishe
	d by
	// the Free Software Foundation, either version 3 of the License, or
	// (at your option) any later version.
	//
	// This program is distributed in the hope that it will be useful,
	// but WITHOUT ANY WARRANTY; without even the implied warranty of
	// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
	// GNU Lesser General Public License for more details.
	//		//
	// You should have received a copy of the GNU Lesser General Public Licens		// See accompanying file COPYING.TXT file for licensing details.
	e
	// along with this program. If not, see <http://www.gnu.org/licenses/>.
	//		//
	/////////////////////////////////////////////////////////////////////////// ////		/////////////////////////////////////////////////////////////////////////// ////
	#ifndef CPPCMS_CACHE_POOL_H		#ifndef CPPCMS_CACHE_POOL_H
	#define CPPCMS_CACHE_POOL_H		#define CPPCMS_CACHE_POOL_H
	#include <cppcms/defs.h>		#include <cppcms/defs.h>
	#include <booster/noncopyable.h>		#include <booster/noncopyable.h>
	#include <booster/intrusive_ptr.h>		#include <booster/intrusive_ptr.h>
	#include <booster/hold_ptr.h>		#include <booster/hold_ptr.h>
	#include <cppcms/base_cache_fwd.h>		#include <cppcms/base_cache_fwd.h>
End of changes. 2 change blocks.
	15 lines changed or deleted		2 lines changed or added

	callback.h		callback.h
	//		//
	// Copyright (c) 2010 Artyom Beilis (Tonkikh)		// Copyright (C) 2009-2012 Artyom Beilis (Tonkikh)
	//		//
	// Distributed under the Boost Software License, Version 1.0. (See		// Distributed under the Boost Software License, Version 1.0. (See
	// accompanying file LICENSE_1_0.txt or copy at		// accompanying file LICENSE_1_0.txt or copy at
	// http://www.boost.org/LICENSE_1_0.txt)		// http://www.boost.org/LICENSE_1_0.txt)
	//		//
	#ifndef BOOSTER_CALLBACK_H		#ifndef BOOSTER_CALLBACK_H
	#define BOOSTER_CALLBACK_H		#define BOOSTER_CALLBACK_H
	#include <booster/backtrace.h>		#include <booster/backtrace.h>
	#include <memory>		#include <memory>
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	clone_ptr.h		clone_ptr.h
	//		//
	// Copyright (c) 2010 Artyom Beilis (Tonkikh)		// Copyright (C) 2009-2012 Artyom Beilis (Tonkikh)
	//		//
	// Distributed under the Boost Software License, Version 1.0. (See		// Distributed under the Boost Software License, Version 1.0. (See
	// accompanying file LICENSE_1_0.txt or copy at		// accompanying file LICENSE_1_0.txt or copy at
	// http://www.boost.org/LICENSE_1_0.txt)		// http://www.boost.org/LICENSE_1_0.txt)
	//		//
	#ifndef BOOSTER_CLONE_PTR_H		#ifndef BOOSTER_CLONE_PTR_H
	#define BOOSTER_CLONE_PTR_H		#define BOOSTER_CLONE_PTR_H
	namespace booster {		namespace booster {
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	config.h		config.h
	//		//
	// Copyright (c) 2010 Artyom Beilis (Tonkikh)		// Copyright (C) 2009-2012 Artyom Beilis (Tonkikh)
	//		//
	// Distributed under the Boost Software License, Version 1.0. (See		// Distributed under the Boost Software License, Version 1.0. (See
	// accompanying file LICENSE_1_0.txt or copy at		// accompanying file LICENSE_1_0.txt or copy at
	// http://www.boost.org/LICENSE_1_0.txt)		// http://www.boost.org/LICENSE_1_0.txt)
	//		//
	#ifndef BOOSTER_CONFIG_H		#ifndef BOOSTER_CONFIG_H
	#define BOOSTER_CONFIG_H		#define BOOSTER_CONFIG_H
	#if defined(__WIN32) || defined(_WIN32) || defined(WIN32) || defined(__CYGW IN__)		#if defined(__WIN32) || defined(_WIN32) || defined(WIN32) || defined(__CYGW IN__)
	# define BOOSTER_SYMBOL_VISIBLE		# define BOOSTER_SYMBOL_VISIBLE
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	copy_filter.h		copy_filter.h
	/////////////////////////////////////////////////////////////////////////// ////		/////////////////////////////////////////////////////////////////////////// ////
	//		//
	// Copyright (C) 2008-2010 Artyom Beilis (Tonkikh) <artyomtnk@yahoo.com>		// Copyright (C) 2008-2012 Artyom Beilis (Tonkikh) <artyomtnk@yahoo.com>
	//
	// This program is free software: you can redistribute it and/or modify
	// it under the terms of the GNU Lesser General Public License as publishe
	d by
	// the Free Software Foundation, either version 3 of the License, or
	// (at your option) any later version.
	//
	// This program is distributed in the hope that it will be useful,
	// but WITHOUT ANY WARRANTY; without even the implied warranty of
	// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
	// GNU Lesser General Public License for more details.
	//		//
	// You should have received a copy of the GNU Lesser General Public Licens		// See accompanying file COPYING.TXT file for licensing details.
	e
	// along with this program. If not, see <http://www.gnu.org/licenses/>.
	//		//
	/////////////////////////////////////////////////////////////////////////// ////		/////////////////////////////////////////////////////////////////////////// ////
	#ifndef CPPCMS_COPY_FILTER_H		#ifndef CPPCMS_COPY_FILTER_H
	#define CPPCMS_COPY_FILTER_H		#define CPPCMS_COPY_FILTER_H
	#include <booster/streambuf.h>		#include <booster/streambuf.h>
	#include <booster/noncopyable.h>		#include <booster/noncopyable.h>
	#include <booster/hold_ptr.h>		#include <booster/hold_ptr.h>
	#include <cppcms/defs.h>		#include <cppcms/defs.h>
	#include <list>		#include <list>
End of changes. 2 change blocks.
	15 lines changed or deleted		2 lines changed or added

	copy_ptr.h		copy_ptr.h
	//		//
	// Copyright (c) 2010 Artyom Beilis (Tonkikh)		// Copyright (C) 2009-2012 Artyom Beilis (Tonkikh)
	//		//
	// Distributed under the Boost Software License, Version 1.0. (See		// Distributed under the Boost Software License, Version 1.0. (See
	// accompanying file LICENSE_1_0.txt or copy at		// accompanying file LICENSE_1_0.txt or copy at
	// http://www.boost.org/LICENSE_1_0.txt)		// http://www.boost.org/LICENSE_1_0.txt)
	//		//
	#ifndef BOOSTER_UTIL_COPY_PTR_H		#ifndef BOOSTER_UTIL_COPY_PTR_H
	#define BOOSTER_UTIL_COPY_PTR_H		#define BOOSTER_UTIL_COPY_PTR_H
	namespace booster {		namespace booster {
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	cppcms_error.h		cppcms_error.h
	/////////////////////////////////////////////////////////////////////////// ////		/////////////////////////////////////////////////////////////////////////// ////
	//		//
	// Copyright (C) 2008-2010 Artyom Beilis (Tonkikh) <artyomtnk@yahoo.com>		// Copyright (C) 2008-2012 Artyom Beilis (Tonkikh) <artyomtnk@yahoo.com>
	//
	// This program is free software: you can redistribute it and/or modify
	// it under the terms of the GNU Lesser General Public License as publishe
	d by
	// the Free Software Foundation, either version 3 of the License, or
	// (at your option) any later version.
	//
	// This program is distributed in the hope that it will be useful,
	// but WITHOUT ANY WARRANTY; without even the implied warranty of
	// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
	// GNU Lesser General Public License for more details.
	//		//
	// You should have received a copy of the GNU Lesser General Public Licens		// See accompanying file COPYING.TXT file for licensing details.
	e
	// along with this program. If not, see <http://www.gnu.org/licenses/>.
	//		//
	/////////////////////////////////////////////////////////////////////////// ////		/////////////////////////////////////////////////////////////////////////// ////
	#ifndef CPPCMS_ERROR_H		#ifndef CPPCMS_ERROR_H
	#define CPPCMS_ERROR_H		#define CPPCMS_ERROR_H
	#include <cppcms/defs.h>		#include <cppcms/defs.h>
	#include <string>		#include <string>
	#include <booster/backtrace.h>		#include <booster/backtrace.h>
	namespace cppcms {		namespace cppcms {
End of changes. 2 change blocks.
	15 lines changed or deleted		2 lines changed or added

	crypto.h		crypto.h
	/////////////////////////////////////////////////////////////////////////// ////		/////////////////////////////////////////////////////////////////////////// ////
	//		//
	// Copyright (C) 2008-2010 Artyom Beilis (Tonkikh) <artyomtnk@yahoo.com>		// Copyright (C) 2008-2012 Artyom Beilis (Tonkikh) <artyomtnk@yahoo.com>
	//
	// This program is free software: you can redistribute it and/or modify
	// it under the terms of the GNU Lesser General Public License as publishe
	d by
	// the Free Software Foundation, either version 3 of the License, or
	// (at your option) any later version.
	//
	// This program is distributed in the hope that it will be useful,
	// but WITHOUT ANY WARRANTY; without even the implied warranty of
	// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
	// GNU Lesser General Public License for more details.
	//		//
	// You should have received a copy of the GNU Lesser General Public Licens		// See accompanying file COPYING.TXT file for licensing details.
	e
	// along with this program. If not, see <http://www.gnu.org/licenses/>.
	//		//
	/////////////////////////////////////////////////////////////////////////// ////		/////////////////////////////////////////////////////////////////////////// ////
	#ifndef CPPCMS_CRYPTO_H		#ifndef CPPCMS_CRYPTO_H
	#define CPPCMS_CRYPTO_H		#define CPPCMS_CRYPTO_H
	#include <cppcms/defs.h>		#include <cppcms/defs.h>
	#include <booster/noncopyable.h>		#include <booster/noncopyable.h>
	#include <booster/hold_ptr.h>		#include <booster/hold_ptr.h>
	#include <memory>		#include <memory>
	#include <string>		#include <string>
End of changes. 2 change blocks.
	15 lines changed or deleted		2 lines changed or added

	cstdint.h		cstdint.h
	//		//
	// Copyright (c) 2010 Artyom Beilis (Tonkikh)		// Copyright (C) 2009-2012 Artyom Beilis (Tonkikh)
	//		//
	// Distributed under the Boost Software License, Version 1.0. (See		// Distributed under the Boost Software License, Version 1.0. (See
	// accompanying file LICENSE_1_0.txt or copy at		// accompanying file LICENSE_1_0.txt or copy at
	// http://www.boost.org/LICENSE_1_0.txt)		// http://www.boost.org/LICENSE_1_0.txt)
	//		//
	#ifndef BOOSTER_CSTDINT_H		#ifndef BOOSTER_CSTDINT_H
	#define BOOSTER_CSTDINT_H		#define BOOSTER_CSTDINT_H
	#include <booster/build_config.h>		#include <booster/build_config.h>
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	ctime.h		ctime.h
	//		//
	// Copyright (c) 2010 Artyom Beilis (Tonkikh)		// Copyright (C) 2009-2012 Artyom Beilis (Tonkikh)
	//		//
	// Distributed under the Boost Software License, Version 1.0. (See		// Distributed under the Boost Software License, Version 1.0. (See
	// accompanying file LICENSE_1_0.txt or copy at		// accompanying file LICENSE_1_0.txt or copy at
	// http://www.boost.org/LICENSE_1_0.txt)		// http://www.boost.org/LICENSE_1_0.txt)
	//		//
	#ifndef BOOSTER_CTIME_H		#ifndef BOOSTER_CTIME_H
	#define BOOSTER_CTIME_H		#define BOOSTER_CTIME_H
	#include <booster/config.h>		#include <booster/config.h>
	#include <ctime>		#include <ctime>
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	deadline_timer.h		deadline_timer.h
	//		//
	// Copyright (c) 2010 Artyom Beilis (Tonkikh)		// Copyright (C) 2009-2012 Artyom Beilis (Tonkikh)
	//		//
	// Distributed under the Boost Software License, Version 1.0. (See		// Distributed under the Boost Software License, Version 1.0. (See
	// accompanying file LICENSE_1_0.txt or copy at		// accompanying file LICENSE_1_0.txt or copy at
	// http://www.boost.org/LICENSE_1_0.txt)		// http://www.boost.org/LICENSE_1_0.txt)
	//		//
	#ifndef BOOSTER_AIO_DEADLINE_TIMER_H		#ifndef BOOSTER_AIO_DEADLINE_TIMER_H
	#define BOOSTER_AIO_DEADLINE_TIMER_H		#define BOOSTER_AIO_DEADLINE_TIMER_H
	#include <booster/config.h>		#include <booster/config.h>
	#include <booster/posix_time.h>		#include <booster/posix_time.h>
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	defs.h		defs.h
	/////////////////////////////////////////////////////////////////////////// ////		/////////////////////////////////////////////////////////////////////////// ////
	//		//
	// Copyright (C) 2008-2010 Artyom Beilis (Tonkikh) <artyomtnk@yahoo.com>		// Copyright (C) 2008-2012 Artyom Beilis (Tonkikh) <artyomtnk@yahoo.com>
	//
	// This program is free software: you can redistribute it and/or modify
	// it under the terms of the GNU Lesser General Public License as publishe
	d by
	// the Free Software Foundation, either version 3 of the License, or
	// (at your option) any later version.
	//
	// This program is distributed in the hope that it will be useful,
	// but WITHOUT ANY WARRANTY; without even the implied warranty of
	// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
	// GNU Lesser General Public License for more details.
	//		//
	// You should have received a copy of the GNU Lesser General Public Licens		// See accompanying file COPYING.TXT file for licensing details.
	e
	// along with this program. If not, see <http://www.gnu.org/licenses/>.
	//		//
	/////////////////////////////////////////////////////////////////////////// ////		/////////////////////////////////////////////////////////////////////////// ////
	#ifndef CPPCMS_DEFS_H		#ifndef CPPCMS_DEFS_H
	#define CPPCMS_DEFS_H		#define CPPCMS_DEFS_H
	#if defined(__WIN32) || defined(_WIN32) || defined(WIN32) || defined(__CYGW IN__)		#if defined(__WIN32) || defined(_WIN32) || defined(WIN32) || defined(__CYGW IN__)
	# if defined(DLL_EXPORT)		# if defined(DLL_EXPORT)
	# if defined(CPPCMS_SOURCE) || defined(CPPCMS_LOCALE_SOURCE)		# if defined(CPPCMS_SOURCE) || defined(CPPCMS_LOCALE_SOURCE)
	# define CPPCMS_API __declspec(dllexport)		# define CPPCMS_API __declspec(dllexport)
	# else		# else
End of changes. 2 change blocks.
	15 lines changed or deleted		2 lines changed or added

	endpoint.h		endpoint.h
	//		//
	// Copyright (c) 2010 Artyom Beilis (Tonkikh)		// Copyright (C) 2009-2012 Artyom Beilis (Tonkikh)
	//		//
	// Distributed under the Boost Software License, Version 1.0. (See		// Distributed under the Boost Software License, Version 1.0. (See
	// accompanying file LICENSE_1_0.txt or copy at		// accompanying file LICENSE_1_0.txt or copy at
	// http://www.boost.org/LICENSE_1_0.txt)		// http://www.boost.org/LICENSE_1_0.txt)
	//		//
	#ifndef BOOSTER_AIO_ENDPOINT_H		#ifndef BOOSTER_AIO_ENDPOINT_H
	#define BOOSTER_AIO_ENDPOINT_H		#define BOOSTER_AIO_ENDPOINT_H
	#include <booster/config.h>		#include <booster/config.h>
	#include <booster/copy_ptr.h>		#include <booster/copy_ptr.h>
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	filters.h		filters.h
	/////////////////////////////////////////////////////////////////////////// ////		/////////////////////////////////////////////////////////////////////////// ////
	//		//
	// Copyright (C) 2008-2010 Artyom Beilis (Tonkikh) <artyomtnk@yahoo.com>		// Copyright (C) 2008-2012 Artyom Beilis (Tonkikh) <artyomtnk@yahoo.com>
	//
	// This program is free software: you can redistribute it and/or modify
	// it under the terms of the GNU Lesser General Public License as publishe
	d by
	// the Free Software Foundation, either version 3 of the License, or
	// (at your option) any later version.
	//
	// This program is distributed in the hope that it will be useful,
	// but WITHOUT ANY WARRANTY; without even the implied warranty of
	// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
	// GNU Lesser General Public License for more details.
	//		//
	// You should have received a copy of the GNU Lesser General Public Licens		// See accompanying file COPYING.TXT file for licensing details.
	e
	// along with this program. If not, see <http://www.gnu.org/licenses/>.
	//		//
	/////////////////////////////////////////////////////////////////////////// ////		/////////////////////////////////////////////////////////////////////////// ////
	#ifndef CPPCMS_FILTERS_H		#ifndef CPPCMS_FILTERS_H
	#define CPPCMS_FILTERS_H		#define CPPCMS_FILTERS_H
	#include <locale>		#include <locale>
	#include <typeinfo>		#include <typeinfo>
	#include <sstream>		#include <sstream>
	#include <vector>		#include <vector>
	#include <iostream>		#include <iostream>
End of changes. 2 change blocks.
	15 lines changed or deleted		2 lines changed or added

	form.h		form.h
	/////////////////////////////////////////////////////////////////////////// ////		/////////////////////////////////////////////////////////////////////////// ////
	//		//
	// Copyright (C) 2008-2010 Artyom Beilis (Tonkikh) <artyomtnk@yahoo.com>		// Copyright (C) 2008-2012 Artyom Beilis (Tonkikh) <artyomtnk@yahoo.com>
	//
	// This program is free software: you can redistribute it and/or modify
	// it under the terms of the GNU Lesser General Public License as publishe
	d by
	// the Free Software Foundation, either version 3 of the License, or
	// (at your option) any later version.
	//
	// This program is distributed in the hope that it will be useful,
	// but WITHOUT ANY WARRANTY; without even the implied warranty of
	// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
	// GNU Lesser General Public License for more details.
	//		//
	// You should have received a copy of the GNU Lesser General Public Licens		// See accompanying file COPYING.TXT file for licensing details.
	e
	// along with this program. If not, see <http://www.gnu.org/licenses/>.
	//		//
	/////////////////////////////////////////////////////////////////////////// ////		/////////////////////////////////////////////////////////////////////////// ////
	#ifndef CPPCMS_FORM_H		#ifndef CPPCMS_FORM_H
	#define CPPCMS_FORM_H		#define CPPCMS_FORM_H
	#include <cppcms/defs.h>		#include <cppcms/defs.h>
	#include <booster/noncopyable.h>		#include <booster/noncopyable.h>
	#include <string>		#include <string>
	#include <set>		#include <set>
End of changes. 2 change blocks.
	15 lines changed or deleted		2 lines changed or added

	forwarder.h		forwarder.h
			///////////////////////////////////////////////////////////////////////////
			////
			//
			// Copyright (C) 2008-2012 Artyom Beilis (Tonkikh) <artyomtnk@yahoo.com>
			//
			// See accompanying file COPYING.TXT file for licensing details.
			//
			///////////////////////////////////////////////////////////////////////////
			////
	#ifndef CPPCMS_FORWARDER_H		#ifndef CPPCMS_FORWARDER_H
	#define CPPCMS_FORWARDER_H		#define CPPCMS_FORWARDER_H
	#include <cppcms/defs.h>		#include <cppcms/defs.h>
	#include <booster/hold_ptr.h>		#include <booster/hold_ptr.h>
	#include <booster/shared_ptr.h>		#include <booster/shared_ptr.h>
	#include <booster/noncopyable.h>		#include <booster/noncopyable.h>
	#include <booster/thread.h>		#include <booster/thread.h>
	#include <string>		#include <string>
	#include <map>		#include <map>
End of changes. 1 change blocks.
	0 lines changed or deleted		9 lines changed or added

	function.h		function.h
	//		//
	// Copyright (c) 2010 Artyom Beilis (Tonkikh)		// Copyright (C) 2009-2012 Artyom Beilis (Tonkikh)
	//		//
	// Distributed under the Boost Software License, Version 1.0. (See		// Distributed under the Boost Software License, Version 1.0. (See
	// accompanying file LICENSE_1_0.txt or copy at		// accompanying file LICENSE_1_0.txt or copy at
	// http://www.boost.org/LICENSE_1_0.txt)		// http://www.boost.org/LICENSE_1_0.txt)
	//		//
	#ifndef BOOSTER_FUNCTION_H		#ifndef BOOSTER_FUNCTION_H
	#define BOOSTER_FUNCTION_H		#define BOOSTER_FUNCTION_H
	#include <booster/backtrace.h>		#include <booster/backtrace.h>
	#include <booster/clone_ptr.h>		#include <booster/clone_ptr.h>
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	hold_ptr.h		hold_ptr.h
	//		//
	// Copyright (c) 2010 Artyom Beilis (Tonkikh)		// Copyright (C) 2009-2012 Artyom Beilis (Tonkikh)
	//		//
	// Distributed under the Boost Software License, Version 1.0. (See		// Distributed under the Boost Software License, Version 1.0. (See
	// accompanying file LICENSE_1_0.txt or copy at		// accompanying file LICENSE_1_0.txt or copy at
	// http://www.boost.org/LICENSE_1_0.txt)		// http://www.boost.org/LICENSE_1_0.txt)
	//		//
	#ifndef BOOSTER_HOLD_PTR_H		#ifndef BOOSTER_HOLD_PTR_H
	#define BOOSTER_HOLD_PTR_H		#define BOOSTER_HOLD_PTR_H
	namespace booster {		namespace booster {
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	http_content_type.h		http_content_type.h
	/////////////////////////////////////////////////////////////////////////// ////		/////////////////////////////////////////////////////////////////////////// ////
	//		//
	// Copyright (C) 2008-2010 Artyom Beilis (Tonkikh) <artyomtnk@yahoo.com>		// Copyright (C) 2008-2012 Artyom Beilis (Tonkikh) <artyomtnk@yahoo.com>
	//
	// This program is free software: you can redistribute it and/or modify
	// it under the terms of the GNU Lesser General Public License as publishe
	d by
	// the Free Software Foundation, either version 3 of the License, or
	// (at your option) any later version.
	//
	// This program is distributed in the hope that it will be useful,
	// but WITHOUT ANY WARRANTY; without even the implied warranty of
	// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
	// GNU Lesser General Public License for more details.
	//		//
	// You should have received a copy of the GNU Lesser General Public Licens		// See accompanying file COPYING.TXT file for licensing details.
	e
	// along with this program. If not, see <http://www.gnu.org/licenses/>.
	//		//
	/////////////////////////////////////////////////////////////////////////// ////		/////////////////////////////////////////////////////////////////////////// ////
	#ifndef CPPCMS_HTTP_CONTENT_TYPE_H		#ifndef CPPCMS_HTTP_CONTENT_TYPE_H
	#define CPPCMS_HTTP_CONTENT_TYPE_H		#define CPPCMS_HTTP_CONTENT_TYPE_H
	#include <cppcms/defs.h>		#include <cppcms/defs.h>
	#include <booster/shared_ptr.h>		#include <booster/shared_ptr.h>
	#include <string>		#include <string>
	#include <map>		#include <map>
End of changes. 2 change blocks.
	15 lines changed or deleted		2 lines changed or added

	http_context.h		http_context.h
	/////////////////////////////////////////////////////////////////////////// ////		/////////////////////////////////////////////////////////////////////////// ////
	//		//
	// Copyright (C) 2008-2010 Artyom Beilis (Tonkikh) <artyomtnk@yahoo.com>		// Copyright (C) 2008-2012 Artyom Beilis (Tonkikh) <artyomtnk@yahoo.com>
	//
	// This program is free software: you can redistribute it and/or modify
	// it under the terms of the GNU Lesser General Public License as publishe
	d by
	// the Free Software Foundation, either version 3 of the License, or
	// (at your option) any later version.
	//
	// This program is distributed in the hope that it will be useful,
	// but WITHOUT ANY WARRANTY; without even the implied warranty of
	// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
	// GNU Lesser General Public License for more details.
	//		//
	// You should have received a copy of the GNU Lesser General Public Licens		// See accompanying file COPYING.TXT file for licensing details.
	e
	// along with this program. If not, see <http://www.gnu.org/licenses/>.
	//		//
	/////////////////////////////////////////////////////////////////////////// ////		/////////////////////////////////////////////////////////////////////////// ////
	#ifndef CPPCMS_HTTP_CONTEXT_H		#ifndef CPPCMS_HTTP_CONTEXT_H
	#define CPPCMS_HTTP_CONTEXT_H		#define CPPCMS_HTTP_CONTEXT_H
	#include <cppcms/defs.h>		#include <cppcms/defs.h>
	#include <booster/hold_ptr.h>		#include <booster/hold_ptr.h>
	#include <booster/intrusive_ptr.h>		#include <booster/intrusive_ptr.h>
	#include <booster/shared_ptr.h>		#include <booster/shared_ptr.h>
	#include <booster/enable_shared_from_this.h>		#include <booster/enable_shared_from_this.h>
End of changes. 2 change blocks.
	15 lines changed or deleted		2 lines changed or added

	http_cookie.h		http_cookie.h
	/////////////////////////////////////////////////////////////////////////// ////		/////////////////////////////////////////////////////////////////////////// ////
	//		//
	// Copyright (C) 2008-2010 Artyom Beilis (Tonkikh) <artyomtnk@yahoo.com>		// Copyright (C) 2008-2012 Artyom Beilis (Tonkikh) <artyomtnk@yahoo.com>
	//
	// This program is free software: you can redistribute it and/or modify
	// it under the terms of the GNU Lesser General Public License as publishe
	d by
	// the Free Software Foundation, either version 3 of the License, or
	// (at your option) any later version.
	//
	// This program is distributed in the hope that it will be useful,
	// but WITHOUT ANY WARRANTY; without even the implied warranty of
	// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
	// GNU Lesser General Public License for more details.
	//		//
	// You should have received a copy of the GNU Lesser General Public Licens		// See accompanying file COPYING.TXT file for licensing details.
	e
	// along with this program. If not, see <http://www.gnu.org/licenses/>.
	//		//
	/////////////////////////////////////////////////////////////////////////// ////		/////////////////////////////////////////////////////////////////////////// ////
	#ifndef CPPCMS_HTTP_COOKIE_H		#ifndef CPPCMS_HTTP_COOKIE_H
	#define CPPCMS_HTTP_COOKIE_H		#define CPPCMS_HTTP_COOKIE_H
	#include <cppcms/defs.h>		#include <cppcms/defs.h>
	#include <booster/copy_ptr.h>		#include <booster/copy_ptr.h>
	#include <string>		#include <string>
	#include <iostream>		#include <iostream>
End of changes. 2 change blocks.
	15 lines changed or deleted		2 lines changed or added

	http_file.h		http_file.h
	/////////////////////////////////////////////////////////////////////////// ////		/////////////////////////////////////////////////////////////////////////// ////
	//		//
	// Copyright (C) 2008-2010 Artyom Beilis (Tonkikh) <artyomtnk@yahoo.com>		// Copyright (C) 2008-2012 Artyom Beilis (Tonkikh) <artyomtnk@yahoo.com>
	//
	// This program is free software: you can redistribute it and/or modify
	// it under the terms of the GNU Lesser General Public License as publishe
	d by
	// the Free Software Foundation, either version 3 of the License, or
	// (at your option) any later version.
	//
	// This program is distributed in the hope that it will be useful,
	// but WITHOUT ANY WARRANTY; without even the implied warranty of
	// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
	// GNU Lesser General Public License for more details.
	//		//
	// You should have received a copy of the GNU Lesser General Public Licens		// See accompanying file COPYING.TXT file for licensing details.
	e
	// along with this program. If not, see <http://www.gnu.org/licenses/>.
	//		//
	/////////////////////////////////////////////////////////////////////////// ////		/////////////////////////////////////////////////////////////////////////// ////
	#ifndef CPPCMS_HTTP_FILE_H		#ifndef CPPCMS_HTTP_FILE_H
	#define CPPCMS_HTTP_FILE_H		#define CPPCMS_HTTP_FILE_H
	#include <cppcms/defs.h>		#include <cppcms/defs.h>
	#include <cppcms/cstdint.h>		#include <cppcms/cstdint.h>
	#include <booster/hold_ptr.h>		#include <booster/hold_ptr.h>
	#include <booster/nowide/fstream.h>		#include <booster/nowide/fstream.h>
	#include <booster/noncopyable.h>		#include <booster/noncopyable.h>
End of changes. 2 change blocks.
	15 lines changed or deleted		2 lines changed or added

	http_request.h		http_request.h
	/////////////////////////////////////////////////////////////////////////// ////		/////////////////////////////////////////////////////////////////////////// ////
	//		//
	// Copyright (C) 2008-2010 Artyom Beilis (Tonkikh) <artyomtnk@yahoo.com>		// Copyright (C) 2008-2012 Artyom Beilis (Tonkikh) <artyomtnk@yahoo.com>
	//
	// This program is free software: you can redistribute it and/or modify
	// it under the terms of the GNU Lesser General Public License as publishe
	d by
	// the Free Software Foundation, either version 3 of the License, or
	// (at your option) any later version.
	//
	// This program is distributed in the hope that it will be useful,
	// but WITHOUT ANY WARRANTY; without even the implied warranty of
	// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
	// GNU Lesser General Public License for more details.
	//		//
	// You should have received a copy of the GNU Lesser General Public Licens		// See accompanying file COPYING.TXT file for licensing details.
	e
	// along with this program. If not, see <http://www.gnu.org/licenses/>.
	//		//
	/////////////////////////////////////////////////////////////////////////// ////		/////////////////////////////////////////////////////////////////////////// ////
	#ifndef CPPCMS_HTTP_REQUEST_H		#ifndef CPPCMS_HTTP_REQUEST_H
	#define CPPCMS_HTTP_REQUEST_H		#define CPPCMS_HTTP_REQUEST_H
	#include <cppcms/defs.h>		#include <cppcms/defs.h>
	#include <booster/noncopyable.h>		#include <booster/noncopyable.h>
	#include <booster/hold_ptr.h>		#include <booster/hold_ptr.h>
	#include <booster/shared_ptr.h>		#include <booster/shared_ptr.h>
	#include <cppcms/http_content_type.h>		#include <cppcms/http_content_type.h>
End of changes. 2 change blocks.
	15 lines changed or deleted		2 lines changed or added

	http_response.h		http_response.h
	/////////////////////////////////////////////////////////////////////////// ////		/////////////////////////////////////////////////////////////////////////// ////
	//		//
	// Copyright (C) 2008-2010 Artyom Beilis (Tonkikh) <artyomtnk@yahoo.com>		// Copyright (C) 2008-2012 Artyom Beilis (Tonkikh) <artyomtnk@yahoo.com>
	//
	// This program is free software: you can redistribute it and/or modify
	// it under the terms of the GNU Lesser General Public License as publishe
	d by
	// the Free Software Foundation, either version 3 of the License, or
	// (at your option) any later version.
	//
	// This program is distributed in the hope that it will be useful,
	// but WITHOUT ANY WARRANTY; without even the implied warranty of
	// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
	// GNU Lesser General Public License for more details.
	//		//
	// You should have received a copy of the GNU Lesser General Public Licens		// See accompanying file COPYING.TXT file for licensing details.
	e
	// along with this program. If not, see <http://www.gnu.org/licenses/>.
	//		//
	/////////////////////////////////////////////////////////////////////////// ////		/////////////////////////////////////////////////////////////////////////// ////
	#ifndef CPPCMS_HTTP_RESPONSE_H		#ifndef CPPCMS_HTTP_RESPONSE_H
	#define CPPCMS_HTTP_RESPONSE_H		#define CPPCMS_HTTP_RESPONSE_H
	#include <cppcms/defs.h>		#include <cppcms/defs.h>
	#include <booster/noncopyable.h>		#include <booster/noncopyable.h>
	#include <booster/hold_ptr.h>		#include <booster/hold_ptr.h>
	#include <string>		#include <string>
End of changes. 2 change blocks.
	15 lines changed or deleted		2 lines changed or added

	index.h		index.h
	skipping to change at line 17		skipping to change at line 17
	//		//
	#ifndef BOOSTER_LOCALE_BOUNDARY_INDEX_H_INCLUDED		#ifndef BOOSTER_LOCALE_BOUNDARY_INDEX_H_INCLUDED
	#define BOOSTER_LOCALE_BOUNDARY_INDEX_H_INCLUDED		#define BOOSTER_LOCALE_BOUNDARY_INDEX_H_INCLUDED
	#include <booster/config.h>		#include <booster/config.h>
	#include <booster/locale/boundary/types.h>		#include <booster/locale/boundary/types.h>
	#include <booster/locale/boundary/facets.h>		#include <booster/locale/boundary/facets.h>
	#include <booster/locale/boundary/segment.h>		#include <booster/locale/boundary/segment.h>
	#include <booster/locale/boundary/boundary_point.h>		#include <booster/locale/boundary/boundary_point.h>
	#include <booster/iterator/iterator_facade.h>		#include <booster/iterator/iterator_facade.h>
			#include <booster/traits/is_base_of.h>
	#include <booster/shared_ptr.h>		#include <booster/shared_ptr.h>
	#include <booster/cstdint.h>		#include <booster/cstdint.h>
	#include <booster/assert.h>		#include <booster/assert.h>
	#ifdef BOOSTER_MSVC		#ifdef BOOSTER_MSVC
	# pragma warning(push)		# pragma warning(push)
	# pragma warning(disable : 4275 4251 4231 4660)		# pragma warning(disable : 4275 4251 4231 4660)
	#endif		#endif
	#include <string>		#include <string>
	#include <locale>		#include <locale>
	#include <vector>		#include <vector>
	skipping to change at line 62		skipping to change at line 63
	typedef typename std::iterator_traits<IteratorType>::va lue_type char_type;		typedef typename std::iterator_traits<IteratorType>::va lue_type char_type;
	static index_type map(boundary_type t,IteratorType b,It eratorType e,std::locale const &l)		static index_type map(boundary_type t,IteratorType b,It eratorType e,std::locale const &l)
	{		{
	std::basic_string<char_type> str(b,e);		std::basic_string<char_type> str(b,e);
	return std::use_facet<boundary_indexing<char_type> >(l).map(t,str.c_str(),str.c_str()+str.size());		return std::use_facet<boundary_indexing<char_type> >(l).map(t,str.c_str(),str.c_str()+str.size());
	}		}
	};		};
	template<typename CharType,typename SomeIteratorType>		template<typename CharType,typename SomeIteratorType>
	struct linear_iterator_traits {		struct linear_iterator_traits {
	static const bool is_linear = false;		static const bool is_linear =
	};		is_same<SomeIteratorType,CharType*>::value
			|| is_same<SomeIteratorType,CharType const*>::value
	template<typename CharType>		|| is_same<SomeIteratorType,typename std::basic_str
	struct linear_iterator_traits<CharType,typename std::basic_		ing<CharType>::iterator>::value
	string<CharType>::iterator> {		|| is_same<SomeIteratorType,typename std::basic_str
	static const bool is_linear = true;		ing<CharType>::const_iterator>::value
	};		|| is_same<SomeIteratorType,typename std::vector<Ch
			arType>::iterator>::value
	template<typename CharType>		|| is_same<SomeIteratorType,typename std::vector<Ch
	struct linear_iterator_traits<CharType,typename std::basic_		arType>::const_iterator>::value
	string<CharType>::const_iterator> {		;
	static const bool is_linear = true;
	};
	template<typename CharType>
	struct linear_iterator_traits<CharType,typename std::vector
	<CharType>::iterator> {
	static const bool is_linear = true;
	};
	template<typename CharType>
	struct linear_iterator_traits<CharType,typename std::vector
	<CharType>::const_iterator> {
	static const bool is_linear = true;
	};
	template<typename CharType>
	struct linear_iterator_traits<CharType,CharType *> {
	static const bool is_linear = true;
	};
	template<typename CharType>
	struct linear_iterator_traits<CharType,CharType const *> {
	static const bool is_linear = true;
	};		};
	template<typename IteratorType>		template<typename IteratorType>
	struct mapping_traits<IteratorType,std::random_access_itera tor_tag> {		struct mapping_traits<IteratorType,std::random_access_itera tor_tag> {
	typedef typename std::iterator_traits<IteratorType>::va lue_type char_type;		typedef typename std::iterator_traits<IteratorType>::va lue_type char_type;
	static index_type map(boundary_type t,IteratorType b,It eratorType e,std::locale const &l)		static index_type map(boundary_type t,IteratorType b,It eratorType e,std::locale const &l)
	{		{
	index_type result;		index_type result;
End of changes. 2 change blocks.
	35 lines changed or deleted		13 lines changed or added

	io_service.h		io_service.h
	//		//
	// Copyright (c) 2010 Artyom Beilis (Tonkikh)		// Copyright (C) 2009-2012 Artyom Beilis (Tonkikh)
	//		//
	// Distributed under the Boost Software License, Version 1.0. (See		// Distributed under the Boost Software License, Version 1.0. (See
	// accompanying file LICENSE_1_0.txt or copy at		// accompanying file LICENSE_1_0.txt or copy at
	// http://www.boost.org/LICENSE_1_0.txt)		// http://www.boost.org/LICENSE_1_0.txt)
	//		//
	#ifndef BOOSTER_AIO_IO_SERVICE_H		#ifndef BOOSTER_AIO_IO_SERVICE_H
	#define BOOSTER_AIO_IO_SERVICE_H		#define BOOSTER_AIO_IO_SERVICE_H
	#include <booster/config.h>		#include <booster/config.h>
	#include <booster/aio/aio_config.h>		#include <booster/aio/aio_config.h>
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	is_base_of.h		is_base_of.h
	//		//
	// Copyright (c) 2010 Artyom Beilis (Tonkikh)		// Copyright (C) 2009-2012 Artyom Beilis (Tonkikh)
	//		//
	// Distributed under the Boost Software License, Version 1.0. (See		// Distributed under the Boost Software License, Version 1.0. (See
	// accompanying file LICENSE_1_0.txt or copy at		// accompanying file LICENSE_1_0.txt or copy at
	// http://www.boost.org/LICENSE_1_0.txt)		// http://www.boost.org/LICENSE_1_0.txt)
	//		//
	#ifndef BOOSTER_IS_BASE_OF_H		#ifndef BOOSTER_IS_BASE_OF_H
	#define BOOSTER_IS_BASE_OF_H		#define BOOSTER_IS_BASE_OF_H
	namespace booster{		namespace booster{
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	iterator_facade.h		iterator_facade.h
	//		//
	// Copyright (c) 2010 Artyom Beilis (Tonkikh)		// Copyright (C) 2009-2012 Artyom Beilis (Tonkikh)
	//		//
	// Distributed under the Boost Software License, Version 1.0. (See		// Distributed under the Boost Software License, Version 1.0. (See
	// accompanying file LICENSE_1_0.txt or copy at		// accompanying file LICENSE_1_0.txt or copy at
	// http://www.boost.org/LICENSE_1_0.txt)		// http://www.boost.org/LICENSE_1_0.txt)
	//		//
	#ifndef BOOSTER_ITERATOR_ITERATOR_FACADE_H		#ifndef BOOSTER_ITERATOR_ITERATOR_FACADE_H
	#define BOOSTER_ITERATOR_ITERATOR_FACADE_H		#define BOOSTER_ITERATOR_ITERATOR_FACADE_H
	#include <cstddef>		#include <cstddef>
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	json.h		json.h
	/////////////////////////////////////////////////////////////////////////// ////		/////////////////////////////////////////////////////////////////////////// ////
	//		//
	// Copyright (C) 2008-2010 Artyom Beilis (Tonkikh) <artyomtnk@yahoo.com>		// Copyright (C) 2008-2012 Artyom Beilis (Tonkikh) <artyomtnk@yahoo.com>
	//
	// This program is free software: you can redistribute it and/or modify
	// it under the terms of the GNU Lesser General Public License as publishe
	d by
	// the Free Software Foundation, either version 3 of the License, or
	// (at your option) any later version.
	//
	// This program is distributed in the hope that it will be useful,
	// but WITHOUT ANY WARRANTY; without even the implied warranty of
	// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
	// GNU Lesser General Public License for more details.
	//		//
	// You should have received a copy of the GNU Lesser General Public Licens		// See accompanying file COPYING.TXT file for licensing details.
	e
	// along with this program. If not, see <http://www.gnu.org/licenses/>.
	//		//
	/////////////////////////////////////////////////////////////////////////// ////		/////////////////////////////////////////////////////////////////////////// ////
	#ifndef CPPCMS_JSON_H		#ifndef CPPCMS_JSON_H
	#define CPPCMS_JSON_H		#define CPPCMS_JSON_H
	#include <cppcms/defs.h>		#include <cppcms/defs.h>
	#include <cppcms/string_key.h>		#include <cppcms/string_key.h>
	#include <booster/copy_ptr.h>		#include <booster/copy_ptr.h>
	#include <booster/backtrace.h>		#include <booster/backtrace.h>
	#include <vector>		#include <vector>
End of changes. 2 change blocks.
	15 lines changed or deleted		2 lines changed or added

	locale_fwd.h		locale_fwd.h
			///////////////////////////////////////////////////////////////////////////
			////
			//
			// Copyright (C) 2008-2012 Artyom Beilis (Tonkikh) <artyomtnk@yahoo.com>
			//
			// See accompanying file COPYING.TXT file for licensing details.
			//
			///////////////////////////////////////////////////////////////////////////
			////
	#ifndef CPPCMS_LOCALE_FWD_H		#ifndef CPPCMS_LOCALE_FWD_H
	#define CPPCMS_LOCALE_FWD_H		#define CPPCMS_LOCALE_FWD_H
	#include <cppcms/config.h>		#include <cppcms/config.h>
	namespace booster {		namespace booster {
	namespace locale {		namespace locale {
	class generator;		class generator;
	class info;		class info;
	}		}
End of changes. 1 change blocks.
	0 lines changed or deleted		9 lines changed or added

	localization.h		localization.h
			///////////////////////////////////////////////////////////////////////////
			////
			//
			// Copyright (C) 2008-2012 Artyom Beilis (Tonkikh) <artyomtnk@yahoo.com>
			//
			// See accompanying file COPYING.TXT file for licensing details.
			//
			///////////////////////////////////////////////////////////////////////////
			////
	#ifndef CPPCMS_LOCALIZATION_H		#ifndef CPPCMS_LOCALIZATION_H
	#define CPPCMS_LOCALIZATION_H		#define CPPCMS_LOCALIZATION_H
	#include <cppcms/config.h>		#include <cppcms/config.h>
	#include <booster/locale.h>		#include <booster/locale.h>
	namespace cppcms {		namespace cppcms {
	namespace locale = ::booster::locale;		namespace locale = ::booster::locale;
	}		}
	#endif		#endif
End of changes. 1 change blocks.
	0 lines changed or deleted		9 lines changed or added

	log.h		log.h
	//		//
	// Copyright (c) 2010 Artyom Beilis (Tonkikh)		// Copyright (C) 2009-2012 Artyom Beilis (Tonkikh)
	//		//
	// Distributed under the Boost Software License, Version 1.0. (See		// Distributed under the Boost Software License, Version 1.0. (See
	// accompanying file LICENSE_1_0.txt or copy at		// accompanying file LICENSE_1_0.txt or copy at
	// http://www.boost.org/LICENSE_1_0.txt)		// http://www.boost.org/LICENSE_1_0.txt)
	//		//
	#ifndef BOOSTER_LOGGER_H		#ifndef BOOSTER_LOGGER_H
	#define BOOSTER_LOGGER_H		#define BOOSTER_LOGGER_H
	#include <booster/config.h>		#include <booster/config.h>
	#include <iosfwd>		#include <iosfwd>
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	mem_bind.h		mem_bind.h
	/////////////////////////////////////////////////////////////////////////// ////		/////////////////////////////////////////////////////////////////////////// ////
	//		//
	// Copyright (C) 2008-2010 Artyom Beilis (Tonkikh) <artyomtnk@yahoo.com>		// Copyright (C) 2008-2012 Artyom Beilis (Tonkikh) <artyomtnk@yahoo.com>
	//
	// This program is free software: you can redistribute it and/or modify
	// it under the terms of the GNU Lesser General Public License as publishe
	d by
	// the Free Software Foundation, either version 3 of the License, or
	// (at your option) any later version.
	//
	// This program is distributed in the hope that it will be useful,
	// but WITHOUT ANY WARRANTY; without even the implied warranty of
	// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
	// GNU Lesser General Public License for more details.
	//		//
	// You should have received a copy of the GNU Lesser General Public Licens		// See accompanying file COPYING.TXT file for licensing details.
	e
	// along with this program. If not, see <http://www.gnu.org/licenses/>.
	//		//
	/////////////////////////////////////////////////////////////////////////// ////		/////////////////////////////////////////////////////////////////////////// ////
	#ifndef CPPCMS_UTIL_MEM_BIND_H		#ifndef CPPCMS_UTIL_MEM_BIND_H
	#define CPPCMS_UTIL_MEM_BIND_H		#define CPPCMS_UTIL_MEM_BIND_H
	namespace cppcms { namespace util {		namespace cppcms { namespace util {
	/// \cond INTERNAL		/// \cond INTERNAL
	namespace details {		namespace details {
	template<typename C,typename P>		template<typename C,typename P>
End of changes. 2 change blocks.
	15 lines changed or deleted		2 lines changed or added

	mount_point.h		mount_point.h
	/////////////////////////////////////////////////////////////////////////// ////		/////////////////////////////////////////////////////////////////////////// ////
	//		//
	// Copyright (C) 2008-2010 Artyom Beilis (Tonkikh) <artyomtnk@yahoo.com>		// Copyright (C) 2008-2012 Artyom Beilis (Tonkikh) <artyomtnk@yahoo.com>
	//
	// This program is free software: you can redistribute it and/or modify
	// it under the terms of the GNU Lesser General Public License as publishe
	d by
	// the Free Software Foundation, either version 3 of the License, or
	// (at your option) any later version.
	//
	// This program is distributed in the hope that it will be useful,
	// but WITHOUT ANY WARRANTY; without even the implied warranty of
	// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
	// GNU Lesser General Public License for more details.
	//		//
	// You should have received a copy of the GNU Lesser General Public Licens		// See accompanying file COPYING.TXT file for licensing details.
	e
	// along with this program. If not, see <http://www.gnu.org/licenses/>.
	//		//
	/////////////////////////////////////////////////////////////////////////// ////		/////////////////////////////////////////////////////////////////////////// ////
	#ifndef CPPCMS_MOUNT_POINT_H		#ifndef CPPCMS_MOUNT_POINT_H
	#define CPPCMS_MOUNT_POINT_H		#define CPPCMS_MOUNT_POINT_H
	#include <cppcms/defs.h>		#include <cppcms/defs.h>
	#include <string>		#include <string>
	#include <booster/perl_regex.h>		#include <booster/perl_regex.h>
	#include <booster/copy_ptr.h>		#include <booster/copy_ptr.h>
End of changes. 2 change blocks.
	15 lines changed or deleted		2 lines changed or added

	noncopyable.h		noncopyable.h
	//		//
	// Copyright (c) 2010 Artyom Beilis (Tonkikh)		// Copyright (C) 2009-2012 Artyom Beilis (Tonkikh)
	//		//
	// Distributed under the Boost Software License, Version 1.0. (See		// Distributed under the Boost Software License, Version 1.0. (See
	// accompanying file LICENSE_1_0.txt or copy at		// accompanying file LICENSE_1_0.txt or copy at
	// http://www.boost.org/LICENSE_1_0.txt)		// http://www.boost.org/LICENSE_1_0.txt)
	//		//
	#ifndef BOOSTER_NONCOPYABLE_H		#ifndef BOOSTER_NONCOPYABLE_H
	#define BOOSTER_NONCOPYABLE_H		#define BOOSTER_NONCOPYABLE_H
	namespace booster {		namespace booster {
	///		///
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	perl_regex.h		perl_regex.h
	//		//
	// Copyright (c) 2010 Artyom Beilis (Tonkikh)		// Copyright (C) 2009-2012 Artyom Beilis (Tonkikh)
	//		//
	// Distributed under the Boost Software License, Version 1.0. (See		// Distributed under the Boost Software License, Version 1.0. (See
	// accompanying file LICENSE_1_0.txt or copy at		// accompanying file LICENSE_1_0.txt or copy at
	// http://www.boost.org/LICENSE_1_0.txt)		// http://www.boost.org/LICENSE_1_0.txt)
	//		//
	#ifndef BOOSTER_PERL_REGEX_H		#ifndef BOOSTER_PERL_REGEX_H
	#define BOOSTER_PERL_REGEX_H		#define BOOSTER_PERL_REGEX_H
	#include <booster/config.h>		#include <booster/config.h>
	#include <booster/copy_ptr.h>		#include <booster/copy_ptr.h>
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	posix_time.h		posix_time.h
	//		//
	// Copyright (c) 2010 Artyom Beilis (Tonkikh)		// Copyright (C) 2009-2012 Artyom Beilis (Tonkikh)
	//		//
	// Distributed under the Boost Software License, Version 1.0. (See		// Distributed under the Boost Software License, Version 1.0. (See
	// accompanying file LICENSE_1_0.txt or copy at		// accompanying file LICENSE_1_0.txt or copy at
	// http://www.boost.org/LICENSE_1_0.txt)		// http://www.boost.org/LICENSE_1_0.txt)
	//		//
	#ifndef BOOSTER_POSIX_TIME_H		#ifndef BOOSTER_POSIX_TIME_H
	#define BOOSTER_POSIX_TIME_H		#define BOOSTER_POSIX_TIME_H
	#include <booster/config.h>		#include <booster/config.h>
	#include <ctime>		#include <ctime>
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	reactor.h		reactor.h
	//		//
	// Copyright (c) 2010 Artyom Beilis (Tonkikh)		// Copyright (C) 2009-2012 Artyom Beilis (Tonkikh)
	//		//
	// Distributed under the Boost Software License, Version 1.0. (See		// Distributed under the Boost Software License, Version 1.0. (See
	// accompanying file LICENSE_1_0.txt or copy at		// accompanying file LICENSE_1_0.txt or copy at
	// http://www.boost.org/LICENSE_1_0.txt)		// http://www.boost.org/LICENSE_1_0.txt)
	//		//
	#ifndef BOOSTER_AIO_REACTOR_H		#ifndef BOOSTER_AIO_REACTOR_H
	#define BOOSTER_AIO_REACTOR_H		#define BOOSTER_AIO_REACTOR_H
	#include <booster/config.h>		#include <booster/config.h>
	#include <booster/aio/types.h>		#include <booster/aio/types.h>
	#include <memory>		#include <memory>
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	refcounted.h		refcounted.h
	/////////////////////////////////////////////////////////////////////////// ////		/////////////////////////////////////////////////////////////////////////// ////
	//		//
	// Copyright (C) 2008-2010 Artyom Beilis (Tonkikh) <artyomtnk@yahoo.com>		// Copyright (C) 2008-2012 Artyom Beilis (Tonkikh)
	//
	// This program is free software: you can redistribute it and/or modify
	// it under the terms of the GNU Lesser General Public License as publishe
	d by
	// the Free Software Foundation, either version 3 of the License, or
	// (at your option) any later version.
	//
	// This program is distributed in the hope that it will be useful,
	// but WITHOUT ANY WARRANTY; without even the implied warranty of
	// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
	// GNU Lesser General Public License for more details.
	//		//
	// You should have received a copy of the GNU Lesser General Public Licens		// Distributed under the Boost Software License, Version 1.0. (See
	e		// accompanying file LICENSE_1_0.txt or copy at
	// along with this program. If not, see <http://www.gnu.org/licenses/>.		// http://www.boost.org/LICENSE_1_0.txt)
	//		//
	/////////////////////////////////////////////////////////////////////////// ////
	#ifndef BOOSTER_REFCOUNTED_H		#ifndef BOOSTER_REFCOUNTED_H
	#define BOOSTER_REFCOUNTED_H		#define BOOSTER_REFCOUNTED_H
	#include <booster/atomic_counter.h>		#include <booster/atomic_counter.h>
	namespace booster {		namespace booster {
	class refcounted;		class refcounted;
	void intrusive_ptr_add_ref(refcounted *ptr);		void intrusive_ptr_add_ref(refcounted *ptr);
	void intrusive_ptr_release(refcounted *ptr);		void intrusive_ptr_release(refcounted *ptr);
End of changes. 3 change blocks.
	16 lines changed or deleted		4 lines changed or added

	regex.h		regex.h
	//		//
	// Copyright (c) 2010 Artyom Beilis (Tonkikh)		// Copyright (C) 2009-2012 Artyom Beilis (Tonkikh)
	//		//
	// Distributed under the Boost Software License, Version 1.0. (See		// Distributed under the Boost Software License, Version 1.0. (See
	// accompanying file LICENSE_1_0.txt or copy at		// accompanying file LICENSE_1_0.txt or copy at
	// http://www.boost.org/LICENSE_1_0.txt)		// http://www.boost.org/LICENSE_1_0.txt)
	//		//
	#ifndef BOOSTER_REGEX_H		#ifndef BOOSTER_REGEX_H
	#define BOOSTER_REGEX_H		#define BOOSTER_REGEX_H
	#include "perl_regex.h"		#include "perl_regex.h"
	#include "regex_match.h"		#include "regex_match.h"
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	regex_match.h		regex_match.h
	//		//
	// Copyright (c) 2010 Artyom Beilis (Tonkikh)		// Copyright (C) 2009-2012 Artyom Beilis (Tonkikh)
	//		//
	// Distributed under the Boost Software License, Version 1.0. (See		// Distributed under the Boost Software License, Version 1.0. (See
	// accompanying file LICENSE_1_0.txt or copy at		// accompanying file LICENSE_1_0.txt or copy at
	// http://www.boost.org/LICENSE_1_0.txt)		// http://www.boost.org/LICENSE_1_0.txt)
	//		//
	#ifndef BOOSTER_REGEX_MATCH_H		#ifndef BOOSTER_REGEX_MATCH_H
	#define BOOSTER_REGEX_MATCH_H		#define BOOSTER_REGEX_MATCH_H
	#include <algorithm>		#include <algorithm>
	#include <iterator>		#include <iterator>
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	rpc_json.h		rpc_json.h
	/////////////////////////////////////////////////////////////////////////// ////		/////////////////////////////////////////////////////////////////////////// ////
	//		//
	// Copyright (C) 2008-2010 Artyom Beilis (Tonkikh) <artyomtnk@yahoo.com>		// Copyright (C) 2008-2012 Artyom Beilis (Tonkikh) <artyomtnk@yahoo.com>
	//
	// This program is free software: you can redistribute it and/or modify
	// it under the terms of the GNU Lesser General Public License as publishe
	d by
	// the Free Software Foundation, either version 3 of the License, or
	// (at your option) any later version.
	//
	// This program is distributed in the hope that it will be useful,
	// but WITHOUT ANY WARRANTY; without even the implied warranty of
	// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
	// GNU Lesser General Public License for more details.
	//		//
	// You should have received a copy of the GNU Lesser General Public Licens		// See accompanying file COPYING.TXT file for licensing details.
	e
	// along with this program. If not, see <http://www.gnu.org/licenses/>.
	//		//
	/////////////////////////////////////////////////////////////////////////// ////		/////////////////////////////////////////////////////////////////////////// ////
	#ifndef CPPCMS_RPC_JSON_OBJECT_H		#ifndef CPPCMS_RPC_JSON_OBJECT_H
	#define CPPCMS_RPC_JSON_OBJECT_H		#define CPPCMS_RPC_JSON_OBJECT_H
	#include <cppcms/application.h>		#include <cppcms/application.h>
	#include <booster/function.h>		#include <booster/function.h>
	#include <cppcms/json.h>		#include <cppcms/json.h>
	#include <cppcms/cppcms_error.h>		#include <cppcms/cppcms_error.h>
End of changes. 2 change blocks.
	15 lines changed or deleted		2 lines changed or added

	serialization.h		serialization.h
	/////////////////////////////////////////////////////////////////////////// ////		/////////////////////////////////////////////////////////////////////////// ////
	//		//
	// Copyright (C) 2008-2010 Artyom Beilis (Tonkikh) <artyomtnk@yahoo.com>		// Copyright (C) 2008-2012 Artyom Beilis (Tonkikh) <artyomtnk@yahoo.com>
	//
	// This program is free software: you can redistribute it and/or modify
	// it under the terms of the GNU Lesser General Public License as publishe
	d by
	// the Free Software Foundation, either version 3 of the License, or
	// (at your option) any later version.
	//
	// This program is distributed in the hope that it will be useful,
	// but WITHOUT ANY WARRANTY; without even the implied warranty of
	// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
	// GNU Lesser General Public License for more details.
	//		//
	// You should have received a copy of the GNU Lesser General Public Licens		// See accompanying file COPYING.TXT file for licensing details.
	e
	// along with this program. If not, see <http://www.gnu.org/licenses/>.
	//		//
	/////////////////////////////////////////////////////////////////////////// ////		/////////////////////////////////////////////////////////////////////////// ////
	#ifndef CPPCMS_SERIALIZATION_H		#ifndef CPPCMS_SERIALIZATION_H
	#define CPPCMS_SERIALIZATION_H		#define CPPCMS_SERIALIZATION_H
	#include <cppcms/serialization_classes.h>		#include <cppcms/serialization_classes.h>
	#include <cppcms/archive_traits.h>		#include <cppcms/archive_traits.h>
	#endif		#endif
End of changes. 2 change blocks.
	15 lines changed or deleted		2 lines changed or added

	serialization_classes.h		serialization_classes.h
	/////////////////////////////////////////////////////////////////////////// ////		/////////////////////////////////////////////////////////////////////////// ////
	//		//
	// Copyright (C) 2008-2010 Artyom Beilis (Tonkikh) <artyomtnk@yahoo.com>		// Copyright (C) 2008-2012 Artyom Beilis (Tonkikh) <artyomtnk@yahoo.com>
	//
	// This program is free software: you can redistribute it and/or modify
	// it under the terms of the GNU Lesser General Public License as publishe
	d by
	// the Free Software Foundation, either version 3 of the License, or
	// (at your option) any later version.
	//
	// This program is distributed in the hope that it will be useful,
	// but WITHOUT ANY WARRANTY; without even the implied warranty of
	// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
	// GNU Lesser General Public License for more details.
	//		//
	// You should have received a copy of the GNU Lesser General Public Licens		// See accompanying file COPYING.TXT file for licensing details.
	e
	// along with this program. If not, see <http://www.gnu.org/licenses/>.
	//		//
	/////////////////////////////////////////////////////////////////////////// ////		/////////////////////////////////////////////////////////////////////////// ////
	#ifndef CPPCMS_SERIALIZATION_CLASSES_H		#ifndef CPPCMS_SERIALIZATION_CLASSES_H
	#define CPPCMS_SERIALIZATION_CLASSES_H		#define CPPCMS_SERIALIZATION_CLASSES_H
	#include <cppcms/defs.h>		#include <cppcms/defs.h>
	#include <booster/copy_ptr.h>		#include <booster/copy_ptr.h>
	#include <string>		#include <string>
	#include <booster/backtrace.h>		#include <booster/backtrace.h>
End of changes. 2 change blocks.
	15 lines changed or deleted		2 lines changed or added

	service.h		service.h
	/////////////////////////////////////////////////////////////////////////// ////		/////////////////////////////////////////////////////////////////////////// ////
	//		//
	// Copyright (C) 2008-2010 Artyom Beilis (Tonkikh) <artyomtnk@yahoo.com>		// Copyright (C) 2008-2012 Artyom Beilis (Tonkikh) <artyomtnk@yahoo.com>
	//
	// This program is free software: you can redistribute it and/or modify
	// it under the terms of the GNU Lesser General Public License as publishe
	d by
	// the Free Software Foundation, either version 3 of the License, or
	// (at your option) any later version.
	//
	// This program is distributed in the hope that it will be useful,
	// but WITHOUT ANY WARRANTY; without even the implied warranty of
	// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
	// GNU Lesser General Public License for more details.
	//		//
	// You should have received a copy of the GNU Lesser General Public Licens		// See accompanying file COPYING.TXT file for licensing details.
	e
	// along with this program. If not, see <http://www.gnu.org/licenses/>.
	//		//
	/////////////////////////////////////////////////////////////////////////// ////		/////////////////////////////////////////////////////////////////////////// ////
	#ifndef CPPCMS_SERVICE_H		#ifndef CPPCMS_SERVICE_H
	#define CPPCMS_SERVICE_H		#define CPPCMS_SERVICE_H
	#include <cppcms/defs.h>		#include <cppcms/defs.h>
	#include <booster/noncopyable.h>		#include <booster/noncopyable.h>
	#include <booster/hold_ptr.h>		#include <booster/hold_ptr.h>
	#include <booster/function.h>		#include <booster/function.h>
	#include <locale>		#include <locale>
	skipping to change at line 206		skipping to change at line 195
	int process_id();		int process_id();
	/// \cond INTERNAL		/// \cond INTERNAL
	// internal functions never call it directly		// internal functions never call it directly
	cppcms::impl::service &impl();		cppcms::impl::service &impl();
	impl::cached_settings const &cached_settings();		impl::cached_settings const &cached_settings();
	#ifdef CPPCMS_WIN_NATIVE
	void impl_run_as_windows_service();
	#endif
	void impl_run_prepare();
	void impl_run_event_loop();
	/// \endcond		/// \endcond
	private:		private:
	void setup();		void setup();
	void setup_logging();
	std::auto_ptr<cppcms::impl::cgi::acceptor> setup_acceptor(js on::value const &,int,int shift=0);		std::auto_ptr<cppcms::impl::cgi::acceptor> setup_acceptor(js on::value const &,int,int shift=0);
	void stop();		void stop();
	void start_acceptor(bool after_fork=false);		void start_acceptor(bool after_fork=false);
	void setup_exit_handling();		void setup_exit_handling();
	bool prefork();		bool prefork();
	void impl_run();		void run_prepare();
			void after_fork_exec();
			void run_acceptor();
			void run_event_loop();
			#ifdef CPPCMS_WIN32
			void run_win_console();
			#endif
	#ifdef CPPCMS_WIN_NATIVE		#ifdef CPPCMS_WIN_NATIVE
	void install_service();		void win_service_prepare();
	void uninstall_service();		void win_service_exec();
			void run_win_service();
	#endif		#endif
	booster::hold_ptr<impl::service> impl_;		booster::hold_ptr<impl::service> impl_;
	};		};
	} //		} //
	#endif		#endif
End of changes. 6 change blocks.
	25 lines changed or deleted		12 lines changed or added

	session_api.h		session_api.h
	/////////////////////////////////////////////////////////////////////////// ////		/////////////////////////////////////////////////////////////////////////// ////
	//		//
	// Copyright (C) 2008-2010 Artyom Beilis (Tonkikh) <artyomtnk@yahoo.com>		// Copyright (C) 2008-2012 Artyom Beilis (Tonkikh) <artyomtnk@yahoo.com>
	//
	// This program is free software: you can redistribute it and/or modify
	// it under the terms of the GNU Lesser General Public License as publishe
	d by
	// the Free Software Foundation, either version 3 of the License, or
	// (at your option) any later version.
	//
	// This program is distributed in the hope that it will be useful,
	// but WITHOUT ANY WARRANTY; without even the implied warranty of
	// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
	// GNU Lesser General Public License for more details.
	//		//
	// You should have received a copy of the GNU Lesser General Public Licens		// See accompanying file COPYING.TXT file for licensing details.
	e
	// along with this program. If not, see <http://www.gnu.org/licenses/>.
	//		//
	/////////////////////////////////////////////////////////////////////////// ////		/////////////////////////////////////////////////////////////////////////// ////
	#ifndef CPPCMS_SESSION_API_H		#ifndef CPPCMS_SESSION_API_H
	#define CPPCMS_SESSION_API_H		#define CPPCMS_SESSION_API_H
	#include <cppcms/defs.h>		#include <cppcms/defs.h>
	#include <booster/noncopyable.h>		#include <booster/noncopyable.h>
	#include <booster/shared_ptr.h>		#include <booster/shared_ptr.h>
	#include <string>		#include <string>
End of changes. 2 change blocks.
	15 lines changed or deleted		2 lines changed or added

	session_cookies.h		session_cookies.h
	/////////////////////////////////////////////////////////////////////////// ////		/////////////////////////////////////////////////////////////////////////// ////
	//		//
	// Copyright (C) 2008-2010 Artyom Beilis (Tonkikh) <artyomtnk@yahoo.com>		// Copyright (C) 2008-2012 Artyom Beilis (Tonkikh) <artyomtnk@yahoo.com>
	//
	// This program is free software: you can redistribute it and/or modify
	// it under the terms of the GNU Lesser General Public License as publishe
	d by
	// the Free Software Foundation, either version 3 of the License, or
	// (at your option) any later version.
	//
	// This program is distributed in the hope that it will be useful,
	// but WITHOUT ANY WARRANTY; without even the implied warranty of
	// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
	// GNU Lesser General Public License for more details.
	//		//
	// You should have received a copy of the GNU Lesser General Public Licens		// See accompanying file COPYING.TXT file for licensing details.
	e
	// along with this program. If not, see <http://www.gnu.org/licenses/>.
	//		//
	/////////////////////////////////////////////////////////////////////////// ////		/////////////////////////////////////////////////////////////////////////// ////
	#ifndef CPPCMS_SESSION_COOKIES_H		#ifndef CPPCMS_SESSION_COOKIES_H
	#define CPPCMS_SESSION_COOKIES_H		#define CPPCMS_SESSION_COOKIES_H
	#include <cppcms/session_api.h>		#include <cppcms/session_api.h>
	#include <booster/hold_ptr.h>		#include <booster/hold_ptr.h>
	#include <booster/noncopyable.h>		#include <booster/noncopyable.h>
	#include <memory>		#include <memory>
	#include <string>		#include <string>
	namespace cppcms {		namespace cppcms {
End of changes. 2 change blocks.
	15 lines changed or deleted		2 lines changed or added

	session_dual.h		session_dual.h
	/////////////////////////////////////////////////////////////////////////// ////		/////////////////////////////////////////////////////////////////////////// ////
	//		//
	// Copyright (C) 2008-2010 Artyom Beilis (Tonkikh) <artyomtnk@yahoo.com>		// Copyright (C) 2008-2012 Artyom Beilis (Tonkikh) <artyomtnk@yahoo.com>
	//
	// This program is free software: you can redistribute it and/or modify
	// it under the terms of the GNU Lesser General Public License as publishe
	d by
	// the Free Software Foundation, either version 3 of the License, or
	// (at your option) any later version.
	//
	// This program is distributed in the hope that it will be useful,
	// but WITHOUT ANY WARRANTY; without even the implied warranty of
	// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
	// GNU Lesser General Public License for more details.
	//		//
	// You should have received a copy of the GNU Lesser General Public Licens		// See accompanying file COPYING.TXT file for licensing details.
	e
	// along with this program. If not, see <http://www.gnu.org/licenses/>.
	//		//
	/////////////////////////////////////////////////////////////////////////// ////		/////////////////////////////////////////////////////////////////////////// ////
	#ifndef CPPCMS_SESSION_DUAL_H		#ifndef CPPCMS_SESSION_DUAL_H
	#define CPPCMS_SESSION_DUAL_H		#define CPPCMS_SESSION_DUAL_H
	#include <cppcms/session_api.h>		#include <cppcms/session_api.h>
	#include <cppcms/defs.h>		#include <cppcms/defs.h>
	#include <booster/hold_ptr.h>		#include <booster/hold_ptr.h>
	#include <booster/shared_ptr.h>		#include <booster/shared_ptr.h>
	#include <memory>		#include <memory>
End of changes. 2 change blocks.
	15 lines changed or deleted		2 lines changed or added

	session_interface.h		session_interface.h
	/////////////////////////////////////////////////////////////////////////// ////		/////////////////////////////////////////////////////////////////////////// ////
	//		//
	// Copyright (C) 2008-2010 Artyom Beilis (Tonkikh) <artyomtnk@yahoo.com>		// Copyright (C) 2008-2012 Artyom Beilis (Tonkikh) <artyomtnk@yahoo.com>
	//
	// This program is free software: you can redistribute it and/or modify
	// it under the terms of the GNU Lesser General Public License as publishe
	d by
	// the Free Software Foundation, either version 3 of the License, or
	// (at your option) any later version.
	//
	// This program is distributed in the hope that it will be useful,
	// but WITHOUT ANY WARRANTY; without even the implied warranty of
	// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
	// GNU Lesser General Public License for more details.
	//		//
	// You should have received a copy of the GNU Lesser General Public Licens		// See accompanying file COPYING.TXT file for licensing details.
	e
	// along with this program. If not, see <http://www.gnu.org/licenses/>.
	//		//
	/////////////////////////////////////////////////////////////////////////// ////		/////////////////////////////////////////////////////////////////////////// ////
	#ifndef CPPCMS_SESSION_INTERFACE_H		#ifndef CPPCMS_SESSION_INTERFACE_H
	#define CPPCMS_SESSION_INTERFACE_H		#define CPPCMS_SESSION_INTERFACE_H
	#include <cppcms/defs.h>		#include <cppcms/defs.h>
	#include <booster/noncopyable.h>		#include <booster/noncopyable.h>
	#include <booster/hold_ptr.h>		#include <booster/hold_ptr.h>
	#include <booster/shared_ptr.h>		#include <booster/shared_ptr.h>
	#include <cppcms/cstdint.h>		#include <cppcms/cstdint.h>
End of changes. 2 change blocks.
	15 lines changed or deleted		2 lines changed or added

	session_pool.h		session_pool.h
	/////////////////////////////////////////////////////////////////////////// ////		/////////////////////////////////////////////////////////////////////////// ////
	//		//
	// Copyright (C) 2008-2010 Artyom Beilis (Tonkikh) <artyomtnk@yahoo.com>		// Copyright (C) 2008-2012 Artyom Beilis (Tonkikh) <artyomtnk@yahoo.com>
	//
	// This program is free software: you can redistribute it and/or modify
	// it under the terms of the GNU Lesser General Public License as publishe
	d by
	// the Free Software Foundation, either version 3 of the License, or
	// (at your option) any later version.
	//
	// This program is distributed in the hope that it will be useful,
	// but WITHOUT ANY WARRANTY; without even the implied warranty of
	// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
	// GNU Lesser General Public License for more details.
	//		//
	// You should have received a copy of the GNU Lesser General Public Licens		// See accompanying file COPYING.TXT file for licensing details.
	e
	// along with this program. If not, see <http://www.gnu.org/licenses/>.
	//		//
	/////////////////////////////////////////////////////////////////////////// ////		/////////////////////////////////////////////////////////////////////////// ////
	#ifndef CPPCMS_SESSION_POOL_H		#ifndef CPPCMS_SESSION_POOL_H
	#define CPPCMS_SESSION_POOL_H		#define CPPCMS_SESSION_POOL_H
	#include <cppcms/defs.h>		#include <cppcms/defs.h>
	#include <booster/shared_ptr.h>		#include <booster/shared_ptr.h>
	#include <booster/hold_ptr.h>		#include <booster/hold_ptr.h>
	#include <cppcms/session_api.h>		#include <cppcms/session_api.h>
End of changes. 2 change blocks.
	15 lines changed or deleted		2 lines changed or added

	session_sid.h		session_sid.h
	/////////////////////////////////////////////////////////////////////////// ////		/////////////////////////////////////////////////////////////////////////// ////
	//		//
	// Copyright (C) 2008-2010 Artyom Beilis (Tonkikh) <artyomtnk@yahoo.com>		// Copyright (C) 2008-2012 Artyom Beilis (Tonkikh) <artyomtnk@yahoo.com>
	//
	// This program is free software: you can redistribute it and/or modify
	// it under the terms of the GNU Lesser General Public License as publishe
	d by
	// the Free Software Foundation, either version 3 of the License, or
	// (at your option) any later version.
	//
	// This program is distributed in the hope that it will be useful,
	// but WITHOUT ANY WARRANTY; without even the implied warranty of
	// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
	// GNU Lesser General Public License for more details.
	//		//
	// You should have received a copy of the GNU Lesser General Public Licens		// See accompanying file COPYING.TXT file for licensing details.
	e
	// along with this program. If not, see <http://www.gnu.org/licenses/>.
	//		//
	/////////////////////////////////////////////////////////////////////////// ////		/////////////////////////////////////////////////////////////////////////// ////
	#ifndef CPPCMS_SESSION_SID_H		#ifndef CPPCMS_SESSION_SID_H
	#define CPPCMS_SESSION_SID_H		#define CPPCMS_SESSION_SID_H
	#include <cppcms/session_api.h>		#include <cppcms/session_api.h>
	#include <cppcms/defs.h>		#include <cppcms/defs.h>
	#include <booster/hold_ptr.h>		#include <booster/hold_ptr.h>
	#include <booster/shared_ptr.h>		#include <booster/shared_ptr.h>
	#include <cppcms/session_storage.h>		#include <cppcms/session_storage.h>
End of changes. 2 change blocks.
	15 lines changed or deleted		2 lines changed or added

	session_storage.h		session_storage.h
	/////////////////////////////////////////////////////////////////////////// ////		/////////////////////////////////////////////////////////////////////////// ////
	//		//
	// Copyright (C) 2008-2010 Artyom Beilis (Tonkikh) <artyomtnk@yahoo.com>		// Copyright (C) 2008-2012 Artyom Beilis (Tonkikh) <artyomtnk@yahoo.com>
	//
	// This program is free software: you can redistribute it and/or modify
	// it under the terms of the GNU Lesser General Public License as publishe
	d by
	// the Free Software Foundation, either version 3 of the License, or
	// (at your option) any later version.
	//
	// This program is distributed in the hope that it will be useful,
	// but WITHOUT ANY WARRANTY; without even the implied warranty of
	// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
	// GNU Lesser General Public License for more details.
	//		//
	// You should have received a copy of the GNU Lesser General Public Licens		// See accompanying file COPYING.TXT file for licensing details.
	e
	// along with this program. If not, see <http://www.gnu.org/licenses/>.
	//		//
	/////////////////////////////////////////////////////////////////////////// ////		/////////////////////////////////////////////////////////////////////////// ////
	#ifndef CPPCMS_SESSION_STORAGE_H		#ifndef CPPCMS_SESSION_STORAGE_H
	#define CPPCMS_SESSION_STORAGE_H		#define CPPCMS_SESSION_STORAGE_H
	#include <cppcms/defs.h>		#include <cppcms/defs.h>
	#include <booster/noncopyable.h>		#include <booster/noncopyable.h>
	#include <booster/shared_ptr.h>		#include <booster/shared_ptr.h>
	#include <string>		#include <string>
End of changes. 2 change blocks.
	15 lines changed or deleted		2 lines changed or added

	shared_object.h		shared_object.h
	//		//
	// Copyright (c) 2010 Artyom Beilis (Tonkikh)		// Copyright (C) 2009-2012 Artyom Beilis (Tonkikh)
	//		//
	// Distributed under the Boost Software License, Version 1.0. (See		// Distributed under the Boost Software License, Version 1.0. (See
	// accompanying file LICENSE_1_0.txt or copy at		// accompanying file LICENSE_1_0.txt or copy at
	// http://www.boost.org/LICENSE_1_0.txt)		// http://www.boost.org/LICENSE_1_0.txt)
	//		//
	#ifndef BOOSTER_SHARED_OBJECT_H		#ifndef BOOSTER_SHARED_OBJECT_H
	#define BOOSTER_SHARED_OBJECT_H		#define BOOSTER_SHARED_OBJECT_H
	#include <booster/config.h>		#include <booster/config.h>
	#include <booster/noncopyable.h>		#include <booster/noncopyable.h>
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	socket.h		socket.h
	//		//
	// Copyright (c) 2010 Artyom Beilis (Tonkikh)		// Copyright (C) 2009-2012 Artyom Beilis (Tonkikh)
	//		//
	// Distributed under the Boost Software License, Version 1.0. (See		// Distributed under the Boost Software License, Version 1.0. (See
	// accompanying file LICENSE_1_0.txt or copy at		// accompanying file LICENSE_1_0.txt or copy at
	// http://www.boost.org/LICENSE_1_0.txt)		// http://www.boost.org/LICENSE_1_0.txt)
	//		//
	#ifndef BOOSTER_AIO_SOCKET_H		#ifndef BOOSTER_AIO_SOCKET_H
	#define BOOSTER_AIO_SOCKET_H		#define BOOSTER_AIO_SOCKET_H
	#include <booster/aio/basic_socket.h>		#include <booster/aio/basic_socket.h>
	#include <booster/aio/stream_socket.h>		#include <booster/aio/stream_socket.h>
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	steal_buf.h		steal_buf.h
	/////////////////////////////////////////////////////////////////////////// ////		/////////////////////////////////////////////////////////////////////////// ////
	//		//
	// Copyright (C) 2008-2010 Artyom Beilis (Tonkikh) <artyomtnk@yahoo.com>		// Copyright (C) 2008-2012 Artyom Beilis (Tonkikh) <artyomtnk@yahoo.com>
	//
	// This program is free software: you can redistribute it and/or modify
	// it under the terms of the GNU Lesser General Public License as publishe
	d by
	// the Free Software Foundation, either version 3 of the License, or
	// (at your option) any later version.
	//
	// This program is distributed in the hope that it will be useful,
	// but WITHOUT ANY WARRANTY; without even the implied warranty of
	// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
	// GNU Lesser General Public License for more details.
	//		//
	// You should have received a copy of the GNU Lesser General Public Licens		// See accompanying file COPYING.TXT file for licensing details.
	e
	// along with this program. If not, see <http://www.gnu.org/licenses/>.
	//		//
	/////////////////////////////////////////////////////////////////////////// ////		/////////////////////////////////////////////////////////////////////////// ////
	#ifndef CPPCMS_STEAL_BUF_H		#ifndef CPPCMS_STEAL_BUF_H
	#define CPPCMS_STEAL_BUF_H		#define CPPCMS_STEAL_BUF_H
	#include <streambuf>		#include <streambuf>
	#include <ostream>		#include <ostream>
	#include <stdio.h>		#include <stdio.h>
	#include <string>		#include <string>
	#include <string.h>		#include <string.h>
End of changes. 2 change blocks.
	15 lines changed or deleted		2 lines changed or added

	stream_socket.h		stream_socket.h
	//		//
	// Copyright (c) 2010 Artyom Beilis (Tonkikh)		// Copyright (C) 2009-2012 Artyom Beilis (Tonkikh)
	//		//
	// Distributed under the Boost Software License, Version 1.0. (See		// Distributed under the Boost Software License, Version 1.0. (See
	// accompanying file LICENSE_1_0.txt or copy at		// accompanying file LICENSE_1_0.txt or copy at
	// http://www.boost.org/LICENSE_1_0.txt)		// http://www.boost.org/LICENSE_1_0.txt)
	//		//
	#ifndef BOOSTER_AIO_STREAM_SOCKET_H		#ifndef BOOSTER_AIO_STREAM_SOCKET_H
	#define BOOSTER_AIO_STREAM_SOCKET_H		#define BOOSTER_AIO_STREAM_SOCKET_H
	#include <booster/aio/types.h>		#include <booster/aio/types.h>
	#include <booster/callback.h>		#include <booster/callback.h>
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	string_key.h		string_key.h
	/////////////////////////////////////////////////////////////////////////// ////		/////////////////////////////////////////////////////////////////////////// ////
	//		//
	// Copyright (C) 2008-2010 Artyom Beilis (Tonkikh) <artyomtnk@yahoo.com>		// Copyright (C) 2008-2012 Artyom Beilis (Tonkikh) <artyomtnk@yahoo.com>
	//
	// This program is free software: you can redistribute it and/or modify
	// it under the terms of the GNU Lesser General Public License as publishe
	d by
	// the Free Software Foundation, either version 3 of the License, or
	// (at your option) any later version.
	//
	// This program is distributed in the hope that it will be useful,
	// but WITHOUT ANY WARRANTY; without even the implied warranty of
	// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
	// GNU Lesser General Public License for more details.
	//		//
	// You should have received a copy of the GNU Lesser General Public Licens		// See accompanying file COPYING.TXT file for licensing details.
	e
	// along with this program. If not, see <http://www.gnu.org/licenses/>.
	//		//
	/////////////////////////////////////////////////////////////////////////// ////		/////////////////////////////////////////////////////////////////////////// ////
	#ifndef CPPCMS_STRING_KEY_H		#ifndef CPPCMS_STRING_KEY_H
	#define CPPCMS_STRING_KEY_H		#define CPPCMS_STRING_KEY_H
	#include <string>		#include <string>
	#include <string.h>		#include <string.h>
	#include <algorithm>		#include <algorithm>
	#include <stdexcept>		#include <stdexcept>
	#include <ostream>		#include <ostream>
End of changes. 2 change blocks.
	15 lines changed or deleted		2 lines changed or added

	system_error.h		system_error.h
	//		//
	// Copyright (c) 2010 Artyom Beilis (Tonkikh)		// Copyright (C) 2009-2012 Artyom Beilis (Tonkikh)
	//		//
	// Distributed under the Boost Software License, Version 1.0. (See		// Distributed under the Boost Software License, Version 1.0. (See
	// accompanying file LICENSE_1_0.txt or copy at		// accompanying file LICENSE_1_0.txt or copy at
	// http://www.boost.org/LICENSE_1_0.txt)		// http://www.boost.org/LICENSE_1_0.txt)
	//		//
	#ifndef BOOSTER_SYSTEM_ERROR_H		#ifndef BOOSTER_SYSTEM_ERROR_H
	#define BOOSTER_SYSTEM_ERROR_H		#define BOOSTER_SYSTEM_ERROR_H
	#include <string>		#include <string>
	#include <booster/backtrace.h>		#include <booster/backtrace.h>
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	thread.h		thread.h
	//		//
	// Copyright (c) 2010 Artyom Beilis (Tonkikh)		// Copyright (C) 2009-2012 Artyom Beilis (Tonkikh)
	//		//
	// Distributed under the Boost Software License, Version 1.0. (See		// Distributed under the Boost Software License, Version 1.0. (See
	// accompanying file LICENSE_1_0.txt or copy at		// accompanying file LICENSE_1_0.txt or copy at
	// http://www.boost.org/LICENSE_1_0.txt)		// http://www.boost.org/LICENSE_1_0.txt)
	//		//
	#ifndef BOOSTER_UTIL_THREAD_H		#ifndef BOOSTER_UTIL_THREAD_H
	#define BOOSTER_UTIL_THREAD_H		#define BOOSTER_UTIL_THREAD_H
	#include <booster/hold_ptr.h>		#include <booster/hold_ptr.h>
	#include <booster/noncopyable.h>		#include <booster/noncopyable.h>
	skipping to change at line 123		skipping to change at line 123
	///		///
	/// Unlock the mutex, \see unique_lock		/// Unlock the mutex, \see unique_lock
	///		///
	void unlock();		void unlock();
	private:		private:
	struct data;		struct data;
	hold_ptr<data> d;		hold_ptr<data> d;
	};		};
	///		///
			/// \brief Recursuve Shared mutex or a.k.a. Read-Write Lock that can
			be recursively locked by \b readers
			///
			/// This class provides two options of locking unique - nobody but m
			e can use the object
			/// shared anybody with shared lock can use the object.
			///
			class BOOSTER_API recursive_shared_mutex : public noncopyable {
			public:
			recursive_shared_mutex();
			~recursive_shared_mutex();
			///
			/// Same as unique_lock()
			///
			/// \note this function is not recursive
			///
			void lock() { unique_lock(); }
			///
			/// Acquire a unique lock on the object. \see booster::uniqu
			e_lock
			///
			/// \note this function is not recursive
			///
			void unique_lock();
			///
			/// Acquire a shared lock on the object. \see booster::shar
			ed_lock
			///
			/// \note the shared_lock() member function is recursive, th
			at means that same thread may acquire
			/// it multiple times.
			///
			void shared_lock();
			///
			/// Release the lock
			///
			void unlock();
			private:
			struct data;
			hold_ptr<data> d;
			};
			///
	/// \brief Shared mutex or a.k.a. Read-Write Lock		/// \brief Shared mutex or a.k.a. Read-Write Lock
	///		///
	/// This class provides two options of locking unique - nobody but m e can use the object		/// This class provides two options of locking unique - nobody but m e can use the object
	/// shared anybody with shared lock can use the object.		/// shared anybody with shared lock can use the object.
	///		///
	class BOOSTER_API shared_mutex : public noncopyable {		class BOOSTER_API shared_mutex : public noncopyable {
	public:		public:
	shared_mutex();		shared_mutex();
	~shared_mutex();		~shared_mutex();
	///		///
	/// Same as unique_lock()		/// Same as unique_lock()
	///		///
	void lock() { unique_lock(); }		void lock() { unique_lock(); }
	///		///
	/// Acquire a unique lock on the object. \see booster::uniqu e_lock		/// Acquire a unique lock on the object. \see booster::uniqu e_lock
	///		///
	void unique_lock();		void unique_lock();
	///		///
	/// Acquire a shared lock on the object. \see booster::shar ed_lock		/// Acquire a shared lock on the object. \see booster::shar ed_lock
	///		///
			/// Note this function is not recursive
			///
	void shared_lock();		void shared_lock();
	///		///
	/// Release the lock		/// Release the lock
	///		///
	void unlock();		void unlock();
	private:		private:
	struct data;		struct data;
	hold_ptr<data> d;		hold_ptr<data> d;
	};		};
End of changes. 3 change blocks.
	1 lines changed or deleted		45 lines changed or added

	thread_pool.h		thread_pool.h
	/////////////////////////////////////////////////////////////////////////// ////		/////////////////////////////////////////////////////////////////////////// ////
	//		//
	// Copyright (C) 2008-2010 Artyom Beilis (Tonkikh) <artyomtnk@yahoo.com>		// Copyright (C) 2008-2012 Artyom Beilis (Tonkikh) <artyomtnk@yahoo.com>
	//
	// This program is free software: you can redistribute it and/or modify
	// it under the terms of the GNU Lesser General Public License as publishe
	d by
	// the Free Software Foundation, either version 3 of the License, or
	// (at your option) any later version.
	//
	// This program is distributed in the hope that it will be useful,
	// but WITHOUT ANY WARRANTY; without even the implied warranty of
	// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
	// GNU Lesser General Public License for more details.
	//		//
	// You should have received a copy of the GNU Lesser General Public Licens		// See accompanying file COPYING.TXT file for licensing details.
	e
	// along with this program. If not, see <http://www.gnu.org/licenses/>.
	//		//
	/////////////////////////////////////////////////////////////////////////// ////		/////////////////////////////////////////////////////////////////////////// ////
	#ifndef CPPCMS_THREAD_POOL_H		#ifndef CPPCMS_THREAD_POOL_H
	#define CPPCMS_THREAD_POOL_H		#define CPPCMS_THREAD_POOL_H
	#include <cppcms/defs.h>		#include <cppcms/defs.h>
	#include <booster/noncopyable.h>		#include <booster/noncopyable.h>
	#include <booster/function.h>		#include <booster/function.h>
	#include <booster/hold_ptr.h>		#include <booster/hold_ptr.h>
End of changes. 2 change blocks.
	15 lines changed or deleted		2 lines changed or added

	types.h		types.h
	//		//
	// Copyright (c) 2010 Artyom Beilis (Tonkikh)		// Copyright (C) 2009-2012 Artyom Beilis (Tonkikh)
	//		//
	// Distributed under the Boost Software License, Version 1.0. (See		// Distributed under the Boost Software License, Version 1.0. (See
	// accompanying file LICENSE_1_0.txt or copy at		// accompanying file LICENSE_1_0.txt or copy at
	// http://www.boost.org/LICENSE_1_0.txt)		// http://www.boost.org/LICENSE_1_0.txt)
	//		//
	#ifndef BOOSTER_AIO_TYPES_H		#ifndef BOOSTER_AIO_TYPES_H
	#define BOOSTER_AIO_TYPES_H		#define BOOSTER_AIO_TYPES_H
	#include <booster/config.h>		#include <booster/config.h>
	#include <stddef.h>		#include <stddef.h>
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	urandom.h		urandom.h
	/////////////////////////////////////////////////////////////////////////// ////		/////////////////////////////////////////////////////////////////////////// ////
	//		//
	// Copyright (C) 2008-2010 Artyom Beilis (Tonkikh) <artyomtnk@yahoo.com>		// Copyright (C) 2008-2012 Artyom Beilis (Tonkikh) <artyomtnk@yahoo.com>
	//
	// This program is free software: you can redistribute it and/or modify
	// it under the terms of the GNU Lesser General Public License as publishe
	d by
	// the Free Software Foundation, either version 3 of the License, or
	// (at your option) any later version.
	//
	// This program is distributed in the hope that it will be useful,
	// but WITHOUT ANY WARRANTY; without even the implied warranty of
	// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
	// GNU Lesser General Public License for more details.
	//		//
	// You should have received a copy of the GNU Lesser General Public Licens		// See accompanying file COPYING.TXT file for licensing details.
	e
	// along with this program. If not, see <http://www.gnu.org/licenses/>.
	//		//
	/////////////////////////////////////////////////////////////////////////// ////		/////////////////////////////////////////////////////////////////////////// ////
	#ifndef CPPCMS_URANDOM_H		#ifndef CPPCMS_URANDOM_H
	#define CPPCMS_URANDOM_H		#define CPPCMS_URANDOM_H
	#include <cppcms/defs.h>		#include <cppcms/defs.h>
	#include <booster/hold_ptr.h>		#include <booster/hold_ptr.h>
	#include <booster/noncopyable.h>		#include <booster/noncopyable.h>
	namespace cppcms {		namespace cppcms {
End of changes. 2 change blocks.
	15 lines changed or deleted		2 lines changed or added

	url_dispatcher.h		url_dispatcher.h
	/////////////////////////////////////////////////////////////////////////// ////		/////////////////////////////////////////////////////////////////////////// ////
	//		//
	// Copyright (C) 2008-2010 Artyom Beilis (Tonkikh) <artyomtnk@yahoo.com>		// Copyright (C) 2008-2012 Artyom Beilis (Tonkikh) <artyomtnk@yahoo.com>
	//
	// This program is free software: you can redistribute it and/or modify
	// it under the terms of the GNU Lesser General Public License as publishe
	d by
	// the Free Software Foundation, either version 3 of the License, or
	// (at your option) any later version.
	//
	// This program is distributed in the hope that it will be useful,
	// but WITHOUT ANY WARRANTY; without even the implied warranty of
	// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
	// GNU Lesser General Public License for more details.
	//		//
	// You should have received a copy of the GNU Lesser General Public Licens		// See accompanying file COPYING.TXT file for licensing details.
	e
	// along with this program. If not, see <http://www.gnu.org/licenses/>.
	//		//
	/////////////////////////////////////////////////////////////////////////// ////		/////////////////////////////////////////////////////////////////////////// ////
	#ifndef CPPCMS_URL_DISPATCHER_H		#ifndef CPPCMS_URL_DISPATCHER_H
	#define CPPCMS_URL_DISPATCHER_H		#define CPPCMS_URL_DISPATCHER_H
	#include <booster/noncopyable.h>		#include <booster/noncopyable.h>
	#include <cppcms/defs.h>		#include <cppcms/defs.h>
	#include <booster/function.h>		#include <booster/function.h>
	#include <booster/hold_ptr.h>		#include <booster/hold_ptr.h>
	#include <booster/traits/enable_if.h>		#include <booster/traits/enable_if.h>
End of changes. 2 change blocks.
	15 lines changed or deleted		2 lines changed or added

	url_mapper.h		url_mapper.h
	/////////////////////////////////////////////////////////////////////////// ////		/////////////////////////////////////////////////////////////////////////// ////
	//		//
	// Copyright (C) 2008-2010 Artyom Beilis (Tonkikh) <artyomtnk@yahoo.com>		// Copyright (C) 2008-2012 Artyom Beilis (Tonkikh) <artyomtnk@yahoo.com>
	//
	// This program is free software: you can redistribute it and/or modify
	// it under the terms of the GNU Lesser General Public License as publishe
	d by
	// the Free Software Foundation, either version 3 of the License, or
	// (at your option) any later version.
	//
	// This program is distributed in the hope that it will be useful,
	// but WITHOUT ANY WARRANTY; without even the implied warranty of
	// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
	// GNU Lesser General Public License for more details.
	//		//
	// You should have received a copy of the GNU Lesser General Public Licens		// See accompanying file COPYING.TXT file for licensing details.
	e
	// along with this program. If not, see <http://www.gnu.org/licenses/>.
	//		//
	/////////////////////////////////////////////////////////////////////////// ////		/////////////////////////////////////////////////////////////////////////// ////
	#ifndef CPPCMS_URL_MAPPER_H		#ifndef CPPCMS_URL_MAPPER_H
	#define CPPCMS_URL_MAPPER_H		#define CPPCMS_URL_MAPPER_H
	#include <cppcms/defs.h>		#include <cppcms/defs.h>
	#include <cppcms/string_key.h>		#include <cppcms/string_key.h>
	#include <booster/noncopyable.h>		#include <booster/noncopyable.h>
	#include <booster/hold_ptr.h>		#include <booster/hold_ptr.h>
	#include <cppcms/filters.h>		#include <cppcms/filters.h>
End of changes. 2 change blocks.
	15 lines changed or deleted		2 lines changed or added

	view.h		view.h
	/////////////////////////////////////////////////////////////////////////// ////		/////////////////////////////////////////////////////////////////////////// ////
	//		//
	// Copyright (C) 2008-2010 Artyom Beilis (Tonkikh) <artyomtnk@yahoo.com>		// Copyright (C) 2008-2012 Artyom Beilis (Tonkikh) <artyomtnk@yahoo.com>
	//
	// This program is free software: you can redistribute it and/or modify
	// it under the terms of the GNU Lesser General Public License as publishe
	d by
	// the Free Software Foundation, either version 3 of the License, or
	// (at your option) any later version.
	//
	// This program is distributed in the hope that it will be useful,
	// but WITHOUT ANY WARRANTY; without even the implied warranty of
	// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
	// GNU Lesser General Public License for more details.
	//		//
	// You should have received a copy of the GNU Lesser General Public Licens		// See accompanying file COPYING.TXT file for licensing details.
	e
	// along with this program. If not, see <http://www.gnu.org/licenses/>.
	//		//
	/////////////////////////////////////////////////////////////////////////// ////		/////////////////////////////////////////////////////////////////////////// ////
	#ifndef CPPCMS_VIEW_H		#ifndef CPPCMS_VIEW_H
	#define CPPCMS_VIEW_H		#define CPPCMS_VIEW_H
	#include <cppcms/form.h>		#include <cppcms/form.h>
	#include <cppcms/filters.h>		#include <cppcms/filters.h>
	#include <cppcms/base_view.h>		#include <cppcms/base_view.h>
	#include <cppcms/views_pool.h>		#include <cppcms/views_pool.h>
	#include <cppcms/application.h>		#include <cppcms/application.h>
	#include <cppcms/url_mapper.h>		#include <cppcms/url_mapper.h>
End of changes. 2 change blocks.
	15 lines changed or deleted		2 lines changed or added

	views_pool.h		views_pool.h
	/////////////////////////////////////////////////////////////////////////// ////		/////////////////////////////////////////////////////////////////////////// ////
	//		//
	// Copyright (C) 2008-2010 Artyom Beilis (Tonkikh) <artyomtnk@yahoo.com>		// Copyright (C) 2008-2012 Artyom Beilis (Tonkikh) <artyomtnk@yahoo.com>
	//
	// This program is free software: you can redistribute it and/or modify
	// it under the terms of the GNU Lesser General Public License as publishe
	d by
	// the Free Software Foundation, either version 3 of the License, or
	// (at your option) any later version.
	//
	// This program is distributed in the hope that it will be useful,
	// but WITHOUT ANY WARRANTY; without even the implied warranty of
	// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
	// GNU Lesser General Public License for more details.
	//		//
	// You should have received a copy of the GNU Lesser General Public Licens		// See accompanying file COPYING.TXT file for licensing details.
	e
	// along with this program. If not, see <http://www.gnu.org/licenses/>.
	//		//
	/////////////////////////////////////////////////////////////////////////// ////		/////////////////////////////////////////////////////////////////////////// ////
	#ifndef CPPCMS_VIEWS_POOL_H		#ifndef CPPCMS_VIEWS_POOL_H
	#define CPPCMS_VIEWS_POOL_H		#define CPPCMS_VIEWS_POOL_H
	#include <cppcms/defs.h>		#include <cppcms/defs.h>
	#include <booster/noncopyable.h>		#include <booster/noncopyable.h>
	#include <cppcms/base_view.h>		#include <cppcms/base_view.h>
	#include <memory>		#include <memory>
End of changes. 2 change blocks.
	15 lines changed or deleted		2 lines changed or added

	xss.h		xss.h
	/////////////////////////////////////////////////////////////////////////// ////		/////////////////////////////////////////////////////////////////////////// ////
	//		//
	// Copyright (C) 2008-2010 Artyom Beilis (Tonkikh) <artyomtnk@yahoo.com>		// Copyright (C) 2008-2012 Artyom Beilis (Tonkikh) <artyomtnk@yahoo.com>
	//
	// This program is free software: you can redistribute it and/or modify
	// it under the terms of the GNU Lesser General Public License as publishe
	d by
	// the Free Software Foundation, either version 3 of the License, or
	// (at your option) any later version.
	//
	// This program is distributed in the hope that it will be useful,
	// but WITHOUT ANY WARRANTY; without even the implied warranty of
	// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
	// GNU Lesser General Public License for more details.
	//		//
	// You should have received a copy of the GNU Lesser General Public Licens		// See accompanying file COPYING.TXT file for licensing details.
	e
	// along with this program. If not, see <http://www.gnu.org/licenses/>.
	//		//
	/////////////////////////////////////////////////////////////////////////// ////		/////////////////////////////////////////////////////////////////////////// ////
	#ifndef CPPCMS_XSS_H		#ifndef CPPCMS_XSS_H
	#define CPPCMS_XSS_H		#define CPPCMS_XSS_H
	#include <booster/copy_ptr.h>		#include <booster/copy_ptr.h>
	#include <booster/regex.h>		#include <booster/regex.h>
	#include <booster/function.h>		#include <booster/function.h>
	#include <cppcms/defs.h>		#include <cppcms/defs.h>
End of changes. 2 change blocks.
	15 lines changed or deleted		2 lines changed or added

This html diff was produced by rfcdiff 1.41. The latest version is available from http://tools.ietf.org/tools/rfcdiff/