bson-inl.h		bson-inl.h
	skipping to change at line 1002		skipping to change at line 1002
	return true;		return true;
	}		}
	template<> inline bool BSONElement::coerce<int>( int* out ) const {		template<> inline bool BSONElement::coerce<int>( int* out ) const {
	if ( !isNumber() )		if ( !isNumber() )
	return false;		return false;
	*out = numberInt();		*out = numberInt();
	return true;		return true;
	}		}
			template<> inline bool BSONElement::coerce<long long>( long long* out )
			const {
			if ( !isNumber() )
			return false;
			*out = numberLong();
			return true;
			}
	template<> inline bool BSONElement::coerce<double>( double* out ) const {		template<> inline bool BSONElement::coerce<double>( double* out ) const {
	if ( !isNumber() )		if ( !isNumber() )
	return false;		return false;
	*out = numberDouble();		*out = numberDouble();
	return true;		return true;
	}		}
	template<> inline bool BSONElement::coerce<bool>( bool* out ) const {		template<> inline bool BSONElement::coerce<bool>( bool* out ) const {
	*out = trueValue();		*out = trueValue();
	return true;		return true;
End of changes. 1 change blocks.
	0 lines changed or deleted		8 lines changed or added

	bsonobjbuilder.h		bsonobjbuilder.h
	skipping to change at line 58		skipping to change at line 58
	/** Utility for creating a BSONObj.		/** Utility for creating a BSONObj.
	See also the BSON() and BSON_ARRAY() macros.		See also the BSON() and BSON_ARRAY() macros.
	*/		*/
	class MONGO_CLIENT_API BSONObjBuilder : public BSONBuilderBase, private boost::noncopyable {		class MONGO_CLIENT_API BSONObjBuilder : public BSONBuilderBase, private boost::noncopyable {
	public:		public:
	/** @param initsize this is just a hint as to the final size of the object */		/** @param initsize this is just a hint as to the final size of the object */
	BSONObjBuilder(int initsize=512) : _b(_buf), _buf(initsize + sizeof (unsigned)), _offset( sizeof(unsigned) ), _s( this ) , _tracker(0) , _doneC alled(false) {		BSONObjBuilder(int initsize=512) : _b(_buf), _buf(initsize + sizeof (unsigned)), _offset( sizeof(unsigned) ), _s( this ) , _tracker(0) , _doneC alled(false) {
	_b.appendNum((unsigned)0); // ref-count		_b.appendNum((unsigned)0); // ref-count
	_b.skip(4); /*leave room for size field and ref-count*/		_b.skip(4); /*leave room for size field and ref-count*/
			// Reserve space for the EOO byte. This means _done() can't fai
			l.
			_b.reserveBytes(1);
	}		}
	/** @param baseBuilder construct a BSONObjBuilder using an existing BufBuilder		/** @param baseBuilder construct a BSONObjBuilder using an existing BufBuilder
	* This is for more efficient adding of subobjects/arrays. See doc s for subobjStart for example.		* This is for more efficient adding of subobjects/arrays. See doc s for subobjStart for example.
	*/		*/
	BSONObjBuilder( BufBuilder &baseBuilder ) : _b( baseBuilder ), _buf ( 0 ), _offset( baseBuilder.len() ), _s( this ) , _tracker(0) , _doneCalled (false) {		BSONObjBuilder( BufBuilder &baseBuilder ) : _b( baseBuilder ), _buf ( 0 ), _offset( baseBuilder.len() ), _s( this ) , _tracker(0) , _doneCalled (false) {
	_b.skip( 4 );		_b.skip( 4 );
			// Reserve space for the EOO byte. This means _done() can't fai
			l.
			_b.reserveBytes(1);
	}		}
	BSONObjBuilder( const BSONSizeTracker & tracker ) : _b(_buf) , _buf (tracker.getSize() + sizeof(unsigned) ), _offset( sizeof(unsigned) ), _s( t his ) , _tracker( (BSONSizeTracker*)(&tracker) ) , _doneCalled(false) {		BSONObjBuilder( const BSONSizeTracker & tracker ) : _b(_buf) , _buf (tracker.getSize() + sizeof(unsigned) ), _offset( sizeof(unsigned) ), _s( t his ) , _tracker( (BSONSizeTracker*)(&tracker) ) , _doneCalled(false) {
	_b.appendNum((unsigned)0); // ref-count		_b.appendNum((unsigned)0); // ref-count
	_b.skip(4);		_b.skip(4);
			// Reserve space for the EOO byte. This means _done() can't fai
			l.
			_b.reserveBytes(1);
	}		}
	~BSONObjBuilder() {		~BSONObjBuilder() {
	if ( !_doneCalled && _b.buf() && _buf.getSize() == 0 ) {		if ( !_doneCalled && _b.buf() && _buf.getSize() == 0 ) {
	_done();		_done();
	}		}
	}		}
	/** add all the fields from the object specified to this object */		/** add all the fields from the object specified to this object */
	BSONObjBuilder& appendElements(BSONObj x);		BSONObjBuilder& appendElements(BSONObj x);
	skipping to change at line 603		skipping to change at line 612
	(void)_done();		(void)_done();
	}		}
	/** Peek at what is in the builder, but leave the builder ready for more appends.		/** Peek at what is in the builder, but leave the builder ready for more appends.
	The returned object is only valid until the next modification o r destruction of the builder.		The returned object is only valid until the next modification o r destruction of the builder.
	Intended use case: append a field if not already there.		Intended use case: append a field if not already there.
	*/		*/
	BSONObj asTempObj() {		BSONObj asTempObj() {
	BSONObj temp(_done());		BSONObj temp(_done());
	_b.setlen(_b.len()-1); //next append should overwrite the EOO		_b.setlen(_b.len()-1); //next append should overwrite the EOO
			_b.reserveBytes(1); // Rereserve room for the real EOO
	_doneCalled = false;		_doneCalled = false;
	return temp;		return temp;
	}		}
	/** Make it look as if "done" has been called, so that our destruct or is a no-op. Do		/** Make it look as if "done" has been called, so that our destruct or is a no-op. Do
	* this if you know that you don't care about the contents of the builder you are		* this if you know that you don't care about the contents of the builder you are
	* destroying.		* destroying.
	*		*
	* Note that it is invalid to call any method other than the destr uctor after invoking		* Note that it is invalid to call any method other than the destr uctor after invoking
	* this method.		* this method.
	skipping to change at line 684		skipping to change at line 694
	int len() const { return _b.len(); }		int len() const { return _b.len(); }
	BufBuilder& bb() { return _b; }		BufBuilder& bb() { return _b; }
	private:		private:
	char* _done() {		char* _done() {
	if ( _doneCalled )		if ( _doneCalled )
	return _b.buf() + _offset;		return _b.buf() + _offset;
	_doneCalled = true;		_doneCalled = true;
			// TODO remove this or find some way to prevent it from failing
			. Since this is intended
			// for use with BSON() literal queries, it is less likely to re
			sult in oversized BSON.
	_s.endField();		_s.endField();
			_b.claimReservedBytes(1); // Prevents adding EOO from failing.
	_b.appendNum((char) EOO);		_b.appendNum((char) EOO);
	char *data = _b.buf() + _offset;		char *data = _b.buf() + _offset;
	int size = _b.len() - _offset;		int size = _b.len() - _offset;
	*((int*)data) = size;		*((int*)data) = size;
	if ( _tracker )		if ( _tracker )
	_tracker->got( size );		_tracker->got( size );
	return data;		return data;
	}		}
	BufBuilder &_b;		BufBuilder &_b;
	BufBuilder _buf;		BufBuilder _buf;
End of changes. 7 change blocks.
	0 lines changed or deleted		21 lines changed or added

	builder.h		builder.h
	skipping to change at line 112		skipping to change at line 112
	_BufBuilder(int initsize = 512) : size(initsize) {		_BufBuilder(int initsize = 512) : size(initsize) {
	if ( size > 0 ) {		if ( size > 0 ) {
	data = (char *) al.Malloc(size);		data = (char *) al.Malloc(size);
	if( data == 0 )		if( data == 0 )
	msgasserted(10000, "out of memory BufBuilder");		msgasserted(10000, "out of memory BufBuilder");
	}		}
	else {		else {
	data = 0;		data = 0;
	}		}
	l = 0;		l = 0;
			reservedBytes = 0;
	}		}
	~_BufBuilder() { kill(); }		~_BufBuilder() { kill(); }
	void kill() {		void kill() {
	if ( data ) {		if ( data ) {
	al.Free(data);		al.Free(data);
	data = 0;		data = 0;
	}		}
	}		}
	void reset() {		void reset() {
	l = 0;		l = 0;
			reservedBytes = 0;
	}		}
	void reset( int maxSize ) {		void reset( int maxSize ) {
	l = 0;		l = 0;
			reservedBytes = 0;
	if ( maxSize && size > maxSize ) {		if ( maxSize && size > maxSize ) {
	al.Free(data);		al.Free(data);
	data = (char*)al.Malloc(maxSize);		data = (char*)al.Malloc(maxSize);
	if ( data == 0 )		if ( data == 0 )
	msgasserted( 15913 , "out of memory BufBuilder::reset" );		msgasserted( 15913 , "out of memory BufBuilder::reset" );
	size = maxSize;		size = maxSize;
	}		}
	}		}
	/** leave room for some stuff later		/** leave room for some stuff later
	skipping to change at line 203		skipping to change at line 206
	/** @return length of current string */		/** @return length of current string */
	int len() const { return l; }		int len() const { return l; }
	void setlen( int newLen ) { l = newLen; }		void setlen( int newLen ) { l = newLen; }
	/** @return size of the buffer */		/** @return size of the buffer */
	int getSize() const { return size; }		int getSize() const { return size; }
	/* returns the pre-grow write position */		/* returns the pre-grow write position */
	inline char* grow(int by) {		inline char* grow(int by) {
	int oldlen = l;		int oldlen = l;
	int newLen = l + by;		int newLen = l + by;
	if ( newLen > size ) {		int minSize = newLen + reservedBytes;
	grow_reallocate(newLen);		if ( minSize > size ) {
			grow_reallocate(minSize);
	}		}
	l = newLen;		l = newLen;
	return data + oldlen;		return data + oldlen;
	}		}
			/**
			* Reserve room for some number of bytes to be claimed at a later t
			ime.
			*/
			void reserveBytes(int bytes) {
			int minSize = l + reservedBytes + bytes;
			if (minSize > size)
			grow_reallocate(minSize);
			// This must happen *after* any attempt to grow.
			reservedBytes += bytes;
			}
			/**
			* Claim an earlier reservation of some number of bytes. These byte
			s must already have been
			* reserved. Appends of up to this many bytes immediately following
			a claim are
			* guaranteed to succeed without a need to reallocate.
			*/
			void claimReservedBytes(int bytes) {
			invariant(reservedBytes >= bytes);
			reservedBytes -= bytes;
			}
	private:		private:
	/* "slow" portion of 'grow()' */		/* "slow" portion of 'grow()' */
	void NOINLINE_DECL grow_reallocate(int newLen) {		void NOINLINE_DECL grow_reallocate(int minSize) {
	int a = 64;		int a = 64;
	while( a < newLen )		while (a < minSize)
	a = a * 2;		a = a * 2;
	if ( a > BufferMaxSize ) {		if ( a > BufferMaxSize ) {
	std::stringstream ss;		std::stringstream ss;
	ss << "BufBuilder attempted to grow() to " << a << " bytes, past the 64MB limit.";		ss << "BufBuilder attempted to grow() to " << a << " bytes, past the 64MB limit.";
	msgasserted(13548, ss.str().c_str());		msgasserted(13548, ss.str().c_str());
	}		}
	data = (char *) al.Realloc(data, a);		data = (char *) al.Realloc(data, a);
	if ( data == NULL )		if ( data == NULL )
	msgasserted( 16070 , "out of memory BufBuilder::grow_reallo cate" );		msgasserted( 16070 , "out of memory BufBuilder::grow_reallo cate" );
	size = a;		size = a;
	}		}
	char *data;		char *data;
	int l;		int l;
	int size;		int size;
			int reservedBytes; // eagerly grow_reallocate to keep this many byt es of spare room.
	friend class StringBuilderImpl<Allocator>;		friend class StringBuilderImpl<Allocator>;
	};		};
	typedef _BufBuilder<TrivialAllocator> BufBuilder;		typedef _BufBuilder<TrivialAllocator> BufBuilder;
	/** The StackBufBuilder builds smaller datasets on the stack instead of using malloc.		/** The StackBufBuilder builds smaller datasets on the stack instead of using malloc.
	this can be significantly faster for small bufs. However, you ca n not decouple() the		this can be significantly faster for small bufs. However, you ca n not decouple() the
	buffer with StackBufBuilder.		buffer with StackBufBuilder.
	While designed to be a variable on the stack, if you were to dynami cally allocate one,		While designed to be a variable on the stack, if you were to dynami cally allocate one,
End of changes. 9 change blocks.
	4 lines changed or deleted		35 lines changed or added

	compiler.h		compiler.h
	/*		// Copyright 2012 the V8 project authors. All rights reserved.
	* Copyright 2012 10gen Inc.		// Redistribution and use in source and binary forms, with or without
	*		// modification, are permitted provided that the following conditions are
	* Licensed under the Apache License, Version 2.0 (the "License");		// met:
	* you may not use this file except in compliance with the License.		//
	* You may obtain a copy of the License at		// * Redistributions of source code must retain the above copyright
	*		// notice, this list of conditions and the following disclaimer.
	* http://www.apache.org/licenses/LICENSE-2.0		// * Redistributions in binary form must reproduce the above
	*		// copyright notice, this list of conditions and the following
	* Unless required by applicable law or agreed to in writing, software		// disclaimer in the documentation and/or other materials provided
	* distributed under the License is distributed on an "AS IS" BASIS,		// with the distribution.
	* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.		// * Neither the name of Google Inc. nor the names of its
	* See the License for the specific language governing permissions and		// contributors may be used to endorse or promote products derived
	* limitations under the License.		// from this software without specific prior written permission.
	*/		//
			// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
	#pragma once		// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
			// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
	/**		// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
	* Include "mongo/platform/compiler.h" to get compiler-targeted macro defin		// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
	itions and utilities.		// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
	*		// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
	* The following macros are provided in all compiler environments:		// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
	*		// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
	*		// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
	* MONGO_COMPILER_NORETURN		// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
	*
	* Instructs the compiler that the decorated function will not return thr		#ifndef V8_COMPILER_H_
	ough the normal return		#define V8_COMPILER_H_
	* path.
	*		#include "allocation.h"
	* Correct: MONGO_COMPILER_NORETURN void myAbortFunction();		#include "ast.h"
	*		#include "zone.h"
	*
	* MONGO_COMPILER_VARIABLE_UNUSED		namespace v8 {
	*		namespace internal {
	* Instructs the compiler not to warn if it detects no use of the decorat
	ed variable.		class ScriptDataImpl;
	* Typically only useful for variables that are always declared but only
	used in		// CompilationInfo encapsulates some information known at compile time. It
	* conditionally-compiled code.		// is constructed based on the resources available at compile-time.
	*		class CompilationInfo {
	* Correct: MONGO_COMPILER_VARIABLE_UNUSED int ignored;		public:
	*		CompilationInfo(Handle<Script> script, Zone* zone);
	*		CompilationInfo(Handle<SharedFunctionInfo> shared_info, Zone* zone);
	* MONGO_COMPILER_ALIGN_TYPE(ALIGNMENT)		CompilationInfo(Handle<JSFunction> closure, Zone* zone);
	*
	* Instructs the compiler to use the given minimum alignment for the deco		virtual ~CompilationInfo();
	rated type.
	*		Isolate* isolate() {
	* Alignments should probably always be powers of two. Also, note that m		ASSERT(Isolate::Current() == isolate_);
	ost allocators will not		return isolate_;
	* be able to guarantee better than 16- or 32-byte alignment.		}
	*		Zone* zone() {
	* Correct:		return zone_;
	* class MONGO_COMPILER_ALIGN_TYPE(16) MyClass {...};		}
	*		bool is_lazy() const { return IsLazy::decode(flags_); }
	* Incorrect:		bool is_eval() const { return IsEval::decode(flags_); }
	* MONGO_COMPILER_ALIGN_TYPE(16) class MyClass {...};		bool is_global() const { return IsGlobal::decode(flags_); }
	* class MyClass{...} MONGO_COMPILER_ALIGN_TYPE(16);		bool is_classic_mode() const { return language_mode() == CLASSIC_MODE; }
	*		bool is_extended_mode() const { return language_mode() == EXTENDED_MODE;
	*		}
	* MONGO_COMPILER_ALIGN_VARIABLE(ALIGNMENT)		LanguageMode language_mode() const {
	*		return LanguageModeField::decode(flags_);
	* Instructs the compiler to use the given minimum alignment for the deco		}
	rated variable.		bool is_in_loop() const { return IsInLoop::decode(flags_); }
	*		FunctionLiteral* function() const { return function_; }
	* Note that most allocators will not allow heap allocated alignments tha		Scope* scope() const { return scope_; }
	t are better than 16- or		Scope* global_scope() const { return global_scope_; }
	* 32-byte aligned. Stack allocators may only guarantee up to the natura		Handle<Code> code() const { return code_; }
	l word length worth of		Handle<JSFunction> closure() const { return closure_; }
	* alignment.		Handle<SharedFunctionInfo> shared_info() const { return shared_info_; }
	*		Handle<Script> script() const { return script_; }
	* Correct:		v8::Extension* extension() const { return extension_; }
	* class MyClass {		ScriptDataImpl* pre_parse_data() const { return pre_parse_data_; }
	* MONGO_COMPILER_ALIGN_VARIABLE(8) char a;		Handle<Context> calling_context() const { return calling_context_; }
	* };		int osr_ast_id() const { return osr_ast_id_; }
	*
	* MONGO_COMPILER_ALIGN_VARIABLE(8) class MyClass {...} singletonInstan		void MarkAsEval() {
	ce;		ASSERT(!is_lazy());
	*		flags_ |= IsEval::encode(true);
	* Incorrect:		}
	* int MONGO_COMPILER_ALIGN_VARIABLE(16) a, b;		void MarkAsGlobal() {
	*		ASSERT(!is_lazy());
	*		flags_ |= IsGlobal::encode(true);
	* MONGO_COMPILER_API_EXPORT		}
	*		void SetLanguageMode(LanguageMode language_mode) {
	* Instructs the compiler to label the given type, variable or function a		ASSERT(this->language_mode() == CLASSIC_MODE ||
	s part of the		this->language_mode() == language_mode ||
	* exported interface of the library object under construction.		language_mode == EXTENDED_MODE);
	*		flags_ = LanguageModeField::update(flags_, language_mode);
	* Correct:		}
	* MONGO_COMPILER_API_EXPORT int globalSwitch;		void MarkAsInLoop() {
	* class MONGO_COMPILER_API_EXPORT ExportedType { ... };		ASSERT(is_lazy());
	* MONGO_COMPILER_API_EXPORT SomeType exportedFunction(...);		flags_ |= IsInLoop::encode(true);
	*		}
	* NOTE: Rather than using this macro directly, one typically declares an		void MarkAsNative() {
	other macro named for the		flags_ |= IsNative::encode(true);
	* library, which is conditionally defined to either MONGO_COMIPLER_API_E		}
	XPORT or		bool is_native() const {
	* MONGO_COMPILER_API_IMPORT based on whether the compiler is currently b		return IsNative::decode(flags_);
	uilding the library or		}
	* building an object that depends on the library, respectively. For exa		void SetFunction(FunctionLiteral* literal) {
	mple, MONGO_CLIENT_API		ASSERT(function_ == NULL);
	* might be defined to MONGO_COMPILER_API_EXPORT when building the MongoD		function_ = literal;
	B shared library, and to		}
	* MONGO_COMPILER_API_IMPORT when building an application that links agai		void SetScope(Scope* scope) {
	nst the shared library.		ASSERT(scope_ == NULL);
	*		scope_ = scope;
	*		}
	* MONGO_COMPILER_API_IMPORT		void SetGlobalScope(Scope* global_scope) {
	*		ASSERT(global_scope_ == NULL);
	* Instructs the compiler to label the given type, variable or function a		global_scope_ = global_scope;
	s imported		}
	* from another library, and not part of the library object under constru		void SetCode(Handle<Code> code) { code_ = code; }
	ction.		void SetExtension(v8::Extension* extension) {
	*		ASSERT(!is_lazy());
	* Same correct/incorrect usage as for MONGO_COMPILER_API_EXPORT.		extension_ = extension;
	*		}
	*		void SetPreParseData(ScriptDataImpl* pre_parse_data) {
	* MONGO_COMPILER_API_CALLING_CONVENTION		ASSERT(!is_lazy());
	*		pre_parse_data_ = pre_parse_data;
	* Explicitly decorates a function declaration the api calling conventio		}
	n used for		void SetCallingContext(Handle<Context> context) {
	* shared libraries.		ASSERT(is_eval());
	*		calling_context_ = context;
	* Same correct/incorrect usage as for MONGO_COMPILER_API_EXPORT.		}
	*/		void SetOsrAstId(int osr_ast_id) {
			ASSERT(IsOptimizing());
	#if defined(_MSC_VER)		osr_ast_id_ = osr_ast_id;
	#include "mongo/platform/compiler_msvc.h"		}
	#elif defined(__GNUC__)		void MarkCompilingForDebugging(Handle<Code> current_code) {
	#include "mongo/platform/compiler_gcc.h"		ASSERT(mode_ != OPTIMIZE);
	#else		ASSERT(current_code->kind() == Code::FUNCTION);
	#error "Unsupported compiler family"		flags_ |= IsCompilingForDebugging::encode(true);
			if (current_code->is_compiled_optimizable()) {
			EnableDeoptimizationSupport();
			} else {
			mode_ = CompilationInfo::NONOPT;
			}
			}
			bool IsCompilingForDebugging() {
			return IsCompilingForDebugging::decode(flags_);
			}
			bool has_global_object() const {
			return !closure().is_null() && (closure()->context()->global() != NULL)
			;
			}
			GlobalObject* global_object() const {
			return has_global_object() ? closure()->context()->global() : NULL;
			}
			// Accessors for the different compilation modes.
			bool IsOptimizing() const { return mode_ == OPTIMIZE; }
			bool IsOptimizable() const { return mode_ == BASE; }
			void SetOptimizing(int osr_ast_id) {
			SetMode(OPTIMIZE);
			osr_ast_id_ = osr_ast_id;
			}
			void DisableOptimization();
			// Deoptimization support.
			bool HasDeoptimizationSupport() const {
			return SupportsDeoptimization::decode(flags_);
			}
			void EnableDeoptimizationSupport() {
			ASSERT(IsOptimizable());
			flags_ |= SupportsDeoptimization::encode(true);
			}
			// Determines whether or not to insert a self-optimization header.
			bool ShouldSelfOptimize();
			// Disable all optimization attempts of this info for the rest of the
			// current compilation pipeline.
			void AbortOptimization();
			void set_deferred_handles(DeferredHandles* deferred_handles) {
			ASSERT(deferred_handles_ == NULL);
			deferred_handles_ = deferred_handles;
			}
			void SaveHandles() {
			SaveHandle(&closure_);
			SaveHandle(&shared_info_);
			SaveHandle(&calling_context_);
			SaveHandle(&script_);
			}
			private:
			Isolate* isolate_;
			// Compilation mode.
			// BASE is generated by the full codegen, optionally prepared for bailout
			s.
			// OPTIMIZE is optimized code generated by the Hydrogen-based backend.
			// NONOPT is generated by the full codegen and is not prepared for
			// recompilation/bailouts. These functions are never recompiled.
			enum Mode {
			BASE,
			OPTIMIZE,
			NONOPT
			};
			void Initialize(Mode mode) {
			mode_ = V8::UseCrankshaft() ? mode : NONOPT;
			ASSERT(!script_.is_null());
			if (script_->type()->value() == Script::TYPE_NATIVE) {
			MarkAsNative();
			}
			if (!shared_info_.is_null()) {
			ASSERT(language_mode() == CLASSIC_MODE);
			SetLanguageMode(shared_info_->language_mode());
			}
			}
			void SetMode(Mode mode) {
			ASSERT(V8::UseCrankshaft());
			mode_ = mode;
			}
			// Flags using template class BitField<type, start, length>. All are
			// false by default.
			//
			// Compilation is either eager or lazy.
			class IsLazy: public BitField<bool, 0, 1> {};
			// Flags that can be set for eager compilation.
			class IsEval: public BitField<bool, 1, 1> {};
			class IsGlobal: public BitField<bool, 2, 1> {};
			// Flags that can be set for lazy compilation.
			class IsInLoop: public BitField<bool, 3, 1> {};
			// Strict mode - used in eager compilation.
			class LanguageModeField: public BitField<LanguageMode, 4, 2> {};
			// Is this a function from our natives.
			class IsNative: public BitField<bool, 6, 1> {};
			// Is this code being compiled with support for deoptimization..
			class SupportsDeoptimization: public BitField<bool, 7, 1> {};
			// If compiling for debugging produce just full code matching the
			// initial mode setting.
			class IsCompilingForDebugging: public BitField<bool, 8, 1> {};
			unsigned flags_;
			// Fields filled in by the compilation pipeline.
			// AST filled in by the parser.
			FunctionLiteral* function_;
			// The scope of the function literal as a convenience. Set to indicate
			// that scopes have been analyzed.
			Scope* scope_;
			// The global scope provided as a convenience.
			Scope* global_scope_;
			// The compiled code.
			Handle<Code> code_;
			// Possible initial inputs to the compilation process.
			Handle<JSFunction> closure_;
			Handle<SharedFunctionInfo> shared_info_;
			Handle<Script> script_;
			// Fields possibly needed for eager compilation, NULL by default.
			v8::Extension* extension_;
			ScriptDataImpl* pre_parse_data_;
			// The context of the caller is needed for eval code, and will be a null
			// handle otherwise.
			Handle<Context> calling_context_;
			// Compilation mode flag and whether deoptimization is allowed.
			Mode mode_;
			int osr_ast_id_;
			// The zone from which the compilation pipeline working on this
			// CompilationInfo allocates.
			Zone* zone_;
			DeferredHandles* deferred_handles_;
			template<typename T>
			void SaveHandle(Handle<T> *object) {
			if (!object->is_null()) {
			Handle<T> handle(*(*object));
			*object = handle;
			}
			}
			DISALLOW_COPY_AND_ASSIGN(CompilationInfo);
			};
			// Exactly like a CompilationInfo, except also creates and enters a
			// Zone on construction and deallocates it on exit.
			class CompilationInfoWithZone: public CompilationInfo {
			public:
			explicit CompilationInfoWithZone(Handle<Script> script)
			: CompilationInfo(script, &zone_),
			zone_(script->GetIsolate()),
			zone_scope_(&zone_, DELETE_ON_EXIT) {}
			explicit CompilationInfoWithZone(Handle<SharedFunctionInfo> shared_info)
			: CompilationInfo(shared_info, &zone_),
			zone_(shared_info->GetIsolate()),
			zone_scope_(&zone_, DELETE_ON_EXIT) {}
			explicit CompilationInfoWithZone(Handle<JSFunction> closure)
			: CompilationInfo(closure, &zone_),
			zone_(closure->GetIsolate()),
			zone_scope_(&zone_, DELETE_ON_EXIT) {}
			private:
			Zone zone_;
			ZoneScope zone_scope_;
			};
			// A wrapper around a CompilationInfo that detaches the Handles from
			// the underlying DeferredHandleScope and stores them in info_ on
			// destruction.
			class CompilationHandleScope BASE_EMBEDDED {
			public:
			explicit CompilationHandleScope(CompilationInfo* info)
			: deferred_(info->isolate()), info_(info) {}
			~CompilationHandleScope() {
			info_->set_deferred_handles(deferred_.Detach());
			}
			private:
			DeferredHandleScope deferred_;
			CompilationInfo* info_;
			};
			class HGraph;
			class HGraphBuilder;
			class LChunk;
			// A helper class that calls the three compilation phases in
			// Crankshaft and keeps track of its state. The three phases
			// CreateGraph, OptimizeGraph and GenerateAndInstallCode can either
			// fail, bail-out to the full code generator or succeed. Apart from
			// their return value, the status of the phase last run can be checked
			// using last_status().
			class OptimizingCompiler: public ZoneObject {
			public:
			explicit OptimizingCompiler(CompilationInfo* info)
			: info_(info),
			oracle_(NULL),
			graph_builder_(NULL),
			graph_(NULL),
			chunk_(NULL),
			time_taken_to_create_graph_(0),
			time_taken_to_optimize_(0),
			time_taken_to_codegen_(0),
			last_status_(FAILED) { }
			enum Status {
			FAILED, BAILED_OUT, SUCCEEDED
			};
			MUST_USE_RESULT Status CreateGraph();
			MUST_USE_RESULT Status OptimizeGraph();
			MUST_USE_RESULT Status GenerateAndInstallCode();
			Status last_status() const { return last_status_; }
			CompilationInfo* info() const { return info_; }
			MUST_USE_RESULT Status AbortOptimization() {
			info_->AbortOptimization();
			info_->shared_info()->DisableOptimization();
			return SetLastStatus(BAILED_OUT);
			}
			private:
			CompilationInfo* info_;
			TypeFeedbackOracle* oracle_;
			HGraphBuilder* graph_builder_;
			HGraph* graph_;
			LChunk* chunk_;
			int64_t time_taken_to_create_graph_;
			int64_t time_taken_to_optimize_;
			int64_t time_taken_to_codegen_;
			Status last_status_;
			MUST_USE_RESULT Status SetLastStatus(Status status) {
			last_status_ = status;
			return last_status_;
			}
			void RecordOptimizationStats();
			struct Timer {
			Timer(OptimizingCompiler* compiler, int64_t* location)
			: compiler_(compiler),
			start_(OS::Ticks()),
			location_(location) { }
			~Timer() {
			*location_ += (OS::Ticks() - start_);
			}
			OptimizingCompiler* compiler_;
			int64_t start_;
			int64_t* location_;
			};
			};
			// The V8 compiler
			//
			// General strategy: Source code is translated into an anonymous function w
			/o
			// parameters which then can be executed. If the source code contains other
			// functions, they will be compiled and allocated as part of the compilatio
			n
			// of the source code.
			// Please note this interface returns shared function infos. This means yo
			u
			// need to call Factory::NewFunctionFromSharedFunctionInfo before you have
			a
			// real function with a context.
			class Compiler : public AllStatic {
			public:
			// Default maximum number of function optimization attempts before we
			// give up.
			static const int kDefaultMaxOptCount = 10;
			static const int kMaxInliningLevels = 3;
			// Call count before primitive functions trigger their own optimization.
			static const int kCallsUntilPrimitiveOpt = 200;
			// All routines return a SharedFunctionInfo.
			// If an error occurs an exception is raised and the return handle
			// contains NULL.
			// Compile a String source within a context.
			static Handle<SharedFunctionInfo> Compile(Handle<String> source,
			Handle<Object> script_name,
			int line_offset,
			int column_offset,
			v8::Extension* extension,
			ScriptDataImpl* pre_data,
			Handle<Object> script_data,
			NativesFlag is_natives_code);
			// Compile a String source within a context for Eval.
			static Handle<SharedFunctionInfo> CompileEval(Handle<String> source,
			Handle<Context> context,
			bool is_global,
			LanguageMode language_mode,
			int scope_position);
			// Compile from function info (used for lazy compilation). Returns true o
			n
			// success and false if the compilation resulted in a stack overflow.
			static bool CompileLazy(CompilationInfo* info);
			static void RecompileParallel(Handle<JSFunction> function);
			// Compile a shared function info object (the function is possibly lazily
			// compiled).
			static Handle<SharedFunctionInfo> BuildFunctionInfo(FunctionLiteral* node
			,
			Handle<Script> script
			);
			// Set the function info for a newly compiled function.
			static void SetFunctionInfo(Handle<SharedFunctionInfo> function_info,
			FunctionLiteral* lit,
			bool is_toplevel,
			Handle<Script> script);
			static void InstallOptimizedCode(OptimizingCompiler* info);
			#ifdef ENABLE_DEBUGGER_SUPPORT
			static bool MakeCodeForLiveEdit(CompilationInfo* info);
	#endif		#endif
			static void RecordFunctionCompilation(Logger::LogEventsAndTags tag,
			CompilationInfo* info,
			Handle<SharedFunctionInfo> shared);
			};
			} } // namespace v8::internal
			#endif // V8_COMPILER_H_
End of changes. 2 change blocks.
	135 lines changed or deleted		472 lines changed or added

	idhack_runner.h		idhack_runner.h
	skipping to change at line 37		skipping to change at line 37
	*/		*/
	#pragma once		#pragma once
	#include <boost/scoped_ptr.hpp>		#include <boost/scoped_ptr.hpp>
	#include <string>		#include <string>
	#include "mongo/base/status.h"		#include "mongo/base/status.h"
	#include "mongo/db/diskloc.h"		#include "mongo/db/diskloc.h"
	#include "mongo/db/query/runner.h"		#include "mongo/db/query/runner.h"
			#include "mongo/s/d_logic.h"
	namespace mongo {		namespace mongo {
	class BSONObj;		class BSONObj;
	class CanonicalQuery;		class CanonicalQuery;
	class Collection;		class Collection;
	class DiskLoc;		class DiskLoc;
	class PlanStage;		class PlanStage;
	class TypeExplain;		class TypeExplain;
	struct PlanInfo;		struct PlanInfo;
	skipping to change at line 126		skipping to change at line 127
	// If we're yielding to fetch a document, what is it's diskloc? It may be invalidated		// If we're yielding to fetch a document, what is it's diskloc? It may be invalidated
	// while we're yielded.		// while we're yielded.
	DiskLoc _locFetching;		DiskLoc _locFetching;
	// Number of index keys scanned: should be either 0 or 1.		// Number of index keys scanned: should be either 0 or 1.
	int _nscanned;		int _nscanned;
	// Number of objects scanned: should be either 0 or 1.		// Number of objects scanned: should be either 0 or 1.
	int _nscannedObjects;		int _nscannedObjects;
			// Used to drop documents that don't belong to this shard. Must be
			initialized at the time
			// of construction of the IDHackRunner. Since it is possible for ID
			HackRunner::getNext() to
			// be called inside a getMore (e.g. aggregation will do this), we n
			eed to establish
			// metadata information up front, not at the time that the IDHackRu
			nner is actually used.
			const CollectionMetadataPtr _metadata;
	};		};
	} // namespace mongo		} // namespace mongo
End of changes. 2 change blocks.
	0 lines changed or deleted		11 lines changed or added

	pcre.h		pcre.h
	/*************************************************		/*************************************************
	* Perl-Compatible Regular Expressions *		* Perl-Compatible Regular Expressions *
	*************************************************/		*************************************************/
	/* This is the public header file for the PCRE library, to be #included by		/* This is the public header file for the PCRE library, to be #included by
	applications that call the PCRE functions.		applications that call the PCRE functions.
	Copyright (c) 1997-2012 University of Cambridge		Copyright (c) 1997-2014 University of Cambridge
	--------------------------------------------------------------------------- --		--------------------------------------------------------------------------- --
	Redistribution and use in source and binary forms, with or without		Redistribution and use in source and binary forms, with or without
	modification, are permitted provided that the following conditions are met:		modification, are permitted provided that the following conditions are met:
	* Redistributions of source code must retain the above copyright notice ,		* Redistributions of source code must retain the above copyright notice ,
	this list of conditions and the following disclaimer.		this list of conditions and the following disclaimer.
	* Redistributions in binary form must reproduce the above copyright		* Redistributions in binary form must reproduce the above copyright
	notice, this list of conditions and the following disclaimer in the		notice, this list of conditions and the following disclaimer in the
	skipping to change at line 45		skipping to change at line 45
	POSSIBILITY OF SUCH DAMAGE.		POSSIBILITY OF SUCH DAMAGE.
	--------------------------------------------------------------------------- --		--------------------------------------------------------------------------- --
	*/		*/
	#ifndef _PCRE_H		#ifndef _PCRE_H
	#define _PCRE_H		#define _PCRE_H
	/* The current PCRE version information. */		/* The current PCRE version information. */
	#define PCRE_MAJOR 8		#define PCRE_MAJOR 8
	#define PCRE_MINOR 30		#define PCRE_MINOR 36
	#define PCRE_PRERELEASE		#define PCRE_PRERELEASE
	#define PCRE_DATE 2012-02-04		#define PCRE_DATE 2014-09-26
	/* When an application links to a PCRE DLL in Windows, the symbols that are		/* When an application links to a PCRE DLL in Windows, the symbols that are
	imported have to be identified as such. When building PCRE, the appropriate		imported have to be identified as such. When building PCRE, the appropriate
	export setting is defined in pcre_internal.h, which includes this file. So we		export setting is defined in pcre_internal.h, which includes this file. So we
	don't change existing definitions of PCRE_EXP_DECL and PCRECPP_EXP_DECL. */		don't change existing definitions of PCRE_EXP_DECL and PCRECPP_EXP_DECL. */
	#if defined(_WIN32) && !defined(PCRE_STATIC)		#if defined(_WIN32) && !defined(PCRE_STATIC)
	# ifndef PCRE_EXP_DECL		# ifndef PCRE_EXP_DECL
	# define PCRE_EXP_DECL extern		# define PCRE_EXP_DECL extern __declspec(dllimport)
	# endif		# endif
	# ifdef __cplusplus		# ifdef __cplusplus
	# ifndef PCRECPP_EXP_DECL		# ifndef PCRECPP_EXP_DECL
	# define PCRECPP_EXP_DECL extern		# define PCRECPP_EXP_DECL extern __declspec(dllimport)
	# endif		# endif
	# ifndef PCRECPP_EXP_DEFN		# ifndef PCRECPP_EXP_DEFN
	# define PCRECPP_EXP_DEFN		# define PCRECPP_EXP_DEFN __declspec(dllimport)
	# endif		# endif
	# endif		# endif
	#endif		#endif
	/* By default, we use the standard "extern" declarations. */		/* By default, we use the standard "extern" declarations. */
	#ifndef PCRE_EXP_DECL		#ifndef PCRE_EXP_DECL
	# ifdef __cplusplus		# ifdef __cplusplus
	# define PCRE_EXP_DECL extern "C"		# define PCRE_EXP_DECL extern "C"
	# else		# else
	skipping to change at line 98		skipping to change at line 98
	it is needed here for malloc. */		it is needed here for malloc. */
	#include <stdlib.h>		#include <stdlib.h>
	/* Allow for C++ users */		/* Allow for C++ users */
	#ifdef __cplusplus		#ifdef __cplusplus
	extern "C" {		extern "C" {
	#endif		#endif
	/* Options. Some are compile-time only, some are run-time only, and some ar		/* Public options. Some are compile-time only, some are run-time only, and
	e		some
	both, so we keep them all distinct. However, almost all the bits in the opt		are both. Most of the compile-time options are saved with the compiled rege
	ions		x so
	word are now used. In the long run, we may have to re-use some of the		that they can be inspected during studying (and therefore JIT compiling). N
	compile-time only bits for runtime options, or vice versa. In the comments		ote
	below, "compile", "exec", and "DFA exec" mean that the option is permitted		that pcre_study() has its own set of options. Originally, all the options
	to		defined here used distinct bits. However, almost all the bits in a 32-bit w
	be set for those functions; "used in" means that an option may be set only		ord
	for		are now used, so in order to conserve them, option bits that were previousl
	compile, but is subsequently referenced in exec and/or DFA exec. Any of the		y
	compile-time options may be inspected during studying (and therefore JIT		only recognized at matching time (i.e. by pcre_exec() or pcre_dfa_exec()) m
	compiling). */		ay
			also be used for compile-time options that affect only compiling and are no
	#define PCRE_CASELESS 0x00000001 /* Compile */		t
	#define PCRE_MULTILINE 0x00000002 /* Compile */		relevant for studying or JIT compiling.
	#define PCRE_DOTALL 0x00000004 /* Compile */
	#define PCRE_EXTENDED 0x00000008 /* Compile */		Some options for pcre_compile() change its behaviour but do not affect the
	#define PCRE_ANCHORED 0x00000010 /* Compile, exec, DFA exec */		behaviour of the execution functions. Other options are passed through to t
	#define PCRE_DOLLAR_ENDONLY 0x00000020 /* Compile, used in exec, DFA e		he
	xec */		execution functions and affect their behaviour, with or without affecting t
	#define PCRE_EXTRA 0x00000040 /* Compile */		he
	#define PCRE_NOTBOL 0x00000080 /* Exec, DFA exec */		behaviour of pcre_compile().
	#define PCRE_NOTEOL 0x00000100 /* Exec, DFA exec */
	#define PCRE_UNGREEDY 0x00000200 /* Compile */		Options that can be passed to pcre_compile() are tagged Cx below, with thes
	#define PCRE_NOTEMPTY 0x00000400 /* Exec, DFA exec */		e
	/* The next two are also used in exec and DFA exec */		variants:
	#define PCRE_UTF8 0x00000800 /* Compile (same as PCRE_UTF16)
	*/		C1 Affects compile only
	#define PCRE_UTF16 0x00000800 /* Compile (same as PCRE_UTF8)		C2 Does not affect compile; affects exec, dfa_exec
	*/		C3 Affects compile, exec, dfa_exec
	#define PCRE_NO_AUTO_CAPTURE 0x00001000 /* Compile */		C4 Affects compile, exec, dfa_exec, study
	/* The next two are also used in exec and DFA exec */		C5 Affects compile, exec, study
	#define PCRE_NO_UTF8_CHECK 0x00002000 /* Compile (same as PCRE_NO_UTF
	16_CHECK) */		Options that can be set for pcre_exec() and/or pcre_dfa_exec() are flagged
	#define PCRE_NO_UTF16_CHECK 0x00002000 /* Compile (same as PCRE_NO_UTF		with
	8_CHECK) */		E and D, respectively. They take precedence over C3, C4, and C5 settings pa
	#define PCRE_AUTO_CALLOUT 0x00004000 /* Compile */		ssed
	#define PCRE_PARTIAL_SOFT 0x00008000 /* Exec, DFA exec */		from pcre_compile(). Those that are compatible with JIT execution are flagg
	#define PCRE_PARTIAL 0x00008000 /* Backwards compatible synonym		ed
	*/		with J. */
	#define PCRE_DFA_SHORTEST 0x00010000 /* DFA exec */
	#define PCRE_DFA_RESTART 0x00020000 /* DFA exec */		#define PCRE_CASELESS 0x00000001 /* C1 */
	#define PCRE_FIRSTLINE 0x00040000 /* Compile, used in exec, DFA e		#define PCRE_MULTILINE 0x00000002 /* C1 */
	xec */		#define PCRE_DOTALL 0x00000004 /* C1 */
	#define PCRE_DUPNAMES 0x00080000 /* Compile */		#define PCRE_EXTENDED 0x00000008 /* C1 */
	#define PCRE_NEWLINE_CR 0x00100000 /* Compile, exec, DFA exec */		#define PCRE_ANCHORED 0x00000010 /* C4 E D */
	#define PCRE_NEWLINE_LF 0x00200000 /* Compile, exec, DFA exec */		#define PCRE_DOLLAR_ENDONLY 0x00000020 /* C2 */
	#define PCRE_NEWLINE_CRLF 0x00300000 /* Compile, exec, DFA exec */		#define PCRE_EXTRA 0x00000040 /* C1 */
	#define PCRE_NEWLINE_ANY 0x00400000 /* Compile, exec, DFA exec */		#define PCRE_NOTBOL 0x00000080 /* E D J */
	#define PCRE_NEWLINE_ANYCRLF 0x00500000 /* Compile, exec, DFA exec */		#define PCRE_NOTEOL 0x00000100 /* E D J */
	#define PCRE_BSR_ANYCRLF 0x00800000 /* Compile, exec, DFA exec */		#define PCRE_UNGREEDY 0x00000200 /* C1 */
	#define PCRE_BSR_UNICODE 0x01000000 /* Compile, exec, DFA exec */		#define PCRE_NOTEMPTY 0x00000400 /* E D J */
	#define PCRE_JAVASCRIPT_COMPAT 0x02000000 /* Compile, used in exec */		#define PCRE_UTF8 0x00000800 /* C4 ) */
	#define PCRE_NO_START_OPTIMIZE 0x04000000 /* Compile, exec, DFA exec */		#define PCRE_UTF16 0x00000800 /* C4 ) Synonyms */
	#define PCRE_NO_START_OPTIMISE 0x04000000 /* Synonym */		#define PCRE_UTF32 0x00000800 /* C4 ) */
	#define PCRE_PARTIAL_HARD 0x08000000 /* Exec, DFA exec */		#define PCRE_NO_AUTO_CAPTURE 0x00001000 /* C1 */
	#define PCRE_NOTEMPTY_ATSTART 0x10000000 /* Exec, DFA exec */		#define PCRE_NO_UTF8_CHECK 0x00002000 /* C1 E D J ) */
	#define PCRE_UCP 0x20000000 /* Compile, used in exec, DFA e		#define PCRE_NO_UTF16_CHECK 0x00002000 /* C1 E D J ) Synonyms */
	xec */		#define PCRE_NO_UTF32_CHECK 0x00002000 /* C1 E D J ) */
			#define PCRE_AUTO_CALLOUT 0x00004000 /* C1 */
			#define PCRE_PARTIAL_SOFT 0x00008000 /* E D J ) Synonyms */
			#define PCRE_PARTIAL 0x00008000 /* E D J ) */
			/* This pair use the same bit. */
			#define PCRE_NEVER_UTF 0x00010000 /* C1 ) Overlaid */
			#define PCRE_DFA_SHORTEST 0x00010000 /* D ) Overlaid */
			/* This pair use the same bit. */
			#define PCRE_NO_AUTO_POSSESS 0x00020000 /* C1 ) Overlaid */
			#define PCRE_DFA_RESTART 0x00020000 /* D ) Overlaid */
			#define PCRE_FIRSTLINE 0x00040000 /* C3 */
			#define PCRE_DUPNAMES 0x00080000 /* C1 */
			#define PCRE_NEWLINE_CR 0x00100000 /* C3 E D */
			#define PCRE_NEWLINE_LF 0x00200000 /* C3 E D */
			#define PCRE_NEWLINE_CRLF 0x00300000 /* C3 E D */
			#define PCRE_NEWLINE_ANY 0x00400000 /* C3 E D */
			#define PCRE_NEWLINE_ANYCRLF 0x00500000 /* C3 E D */
			#define PCRE_BSR_ANYCRLF 0x00800000 /* C3 E D */
			#define PCRE_BSR_UNICODE 0x01000000 /* C3 E D */
			#define PCRE_JAVASCRIPT_COMPAT 0x02000000 /* C5 */
			#define PCRE_NO_START_OPTIMIZE 0x04000000 /* C2 E D ) Synonyms */
			#define PCRE_NO_START_OPTIMISE 0x04000000 /* C2 E D ) */
			#define PCRE_PARTIAL_HARD 0x08000000 /* E D J */
			#define PCRE_NOTEMPTY_ATSTART 0x10000000 /* E D J */
			#define PCRE_UCP 0x20000000 /* C3 */
	/* Exec-time and get/set-time error codes */		/* Exec-time and get/set-time error codes */
	#define PCRE_ERROR_NOMATCH (-1)		#define PCRE_ERROR_NOMATCH (-1)
	#define PCRE_ERROR_NULL (-2)		#define PCRE_ERROR_NULL (-2)
	#define PCRE_ERROR_BADOPTION (-3)		#define PCRE_ERROR_BADOPTION (-3)
	#define PCRE_ERROR_BADMAGIC (-4)		#define PCRE_ERROR_BADMAGIC (-4)
	#define PCRE_ERROR_UNKNOWN_OPCODE (-5)		#define PCRE_ERROR_UNKNOWN_OPCODE (-5)
	#define PCRE_ERROR_UNKNOWN_NODE (-5) /* For backward compatibility */		#define PCRE_ERROR_UNKNOWN_NODE (-5) /* For backward compatibility */
	#define PCRE_ERROR_NOMEMORY (-6)		#define PCRE_ERROR_NOMEMORY (-6)
	#define PCRE_ERROR_NOSUBSTRING (-7)		#define PCRE_ERROR_NOSUBSTRING (-7)
	#define PCRE_ERROR_MATCHLIMIT (-8)		#define PCRE_ERROR_MATCHLIMIT (-8)
	#define PCRE_ERROR_CALLOUT (-9) /* Never used by PCRE itself */		#define PCRE_ERROR_CALLOUT (-9) /* Never used by PCRE itself */
	#define PCRE_ERROR_BADUTF8 (-10) /* Same for 8/16 */		#define PCRE_ERROR_BADUTF8 (-10) /* Same for 8/16/32 */
	#define PCRE_ERROR_BADUTF16 (-10) /* Same for 8/16 */		#define PCRE_ERROR_BADUTF16 (-10) /* Same for 8/16/32 */
			#define PCRE_ERROR_BADUTF32 (-10) /* Same for 8/16/32 */
	#define PCRE_ERROR_BADUTF8_OFFSET (-11) /* Same for 8/16 */		#define PCRE_ERROR_BADUTF8_OFFSET (-11) /* Same for 8/16 */
	#define PCRE_ERROR_BADUTF16_OFFSET (-11) /* Same for 8/16 */		#define PCRE_ERROR_BADUTF16_OFFSET (-11) /* Same for 8/16 */
	#define PCRE_ERROR_PARTIAL (-12)		#define PCRE_ERROR_PARTIAL (-12)
	#define PCRE_ERROR_BADPARTIAL (-13)		#define PCRE_ERROR_BADPARTIAL (-13)
	#define PCRE_ERROR_INTERNAL (-14)		#define PCRE_ERROR_INTERNAL (-14)
	#define PCRE_ERROR_BADCOUNT (-15)		#define PCRE_ERROR_BADCOUNT (-15)
	#define PCRE_ERROR_DFA_UITEM (-16)		#define PCRE_ERROR_DFA_UITEM (-16)
	#define PCRE_ERROR_DFA_UCOND (-17)		#define PCRE_ERROR_DFA_UCOND (-17)
	#define PCRE_ERROR_DFA_UMLIMIT (-18)		#define PCRE_ERROR_DFA_UMLIMIT (-18)
	#define PCRE_ERROR_DFA_WSSIZE (-19)		#define PCRE_ERROR_DFA_WSSIZE (-19)
	skipping to change at line 182		skipping to change at line 209
	#define PCRE_ERROR_RECURSIONLIMIT (-21)		#define PCRE_ERROR_RECURSIONLIMIT (-21)
	#define PCRE_ERROR_NULLWSLIMIT (-22) /* No longer actually used */		#define PCRE_ERROR_NULLWSLIMIT (-22) /* No longer actually used */
	#define PCRE_ERROR_BADNEWLINE (-23)		#define PCRE_ERROR_BADNEWLINE (-23)
	#define PCRE_ERROR_BADOFFSET (-24)		#define PCRE_ERROR_BADOFFSET (-24)
	#define PCRE_ERROR_SHORTUTF8 (-25)		#define PCRE_ERROR_SHORTUTF8 (-25)
	#define PCRE_ERROR_SHORTUTF16 (-25) /* Same for 8/16 */		#define PCRE_ERROR_SHORTUTF16 (-25) /* Same for 8/16 */
	#define PCRE_ERROR_RECURSELOOP (-26)		#define PCRE_ERROR_RECURSELOOP (-26)
	#define PCRE_ERROR_JIT_STACKLIMIT (-27)		#define PCRE_ERROR_JIT_STACKLIMIT (-27)
	#define PCRE_ERROR_BADMODE (-28)		#define PCRE_ERROR_BADMODE (-28)
	#define PCRE_ERROR_BADENDIANNESS (-29)		#define PCRE_ERROR_BADENDIANNESS (-29)
			#define PCRE_ERROR_DFA_BADRESTART (-30)
			#define PCRE_ERROR_JIT_BADOPTION (-31)
			#define PCRE_ERROR_BADLENGTH (-32)
			#define PCRE_ERROR_UNSET (-33)
	/* Specific error codes for UTF-8 validity checks */		/* Specific error codes for UTF-8 validity checks */
	#define PCRE_UTF8_ERR0 0		#define PCRE_UTF8_ERR0 0
	#define PCRE_UTF8_ERR1 1		#define PCRE_UTF8_ERR1 1
	#define PCRE_UTF8_ERR2 2		#define PCRE_UTF8_ERR2 2
	#define PCRE_UTF8_ERR3 3		#define PCRE_UTF8_ERR3 3
	#define PCRE_UTF8_ERR4 4		#define PCRE_UTF8_ERR4 4
	#define PCRE_UTF8_ERR5 5		#define PCRE_UTF8_ERR5 5
	#define PCRE_UTF8_ERR6 6		#define PCRE_UTF8_ERR6 6
	skipping to change at line 207		skipping to change at line 238
	#define PCRE_UTF8_ERR12 12		#define PCRE_UTF8_ERR12 12
	#define PCRE_UTF8_ERR13 13		#define PCRE_UTF8_ERR13 13
	#define PCRE_UTF8_ERR14 14		#define PCRE_UTF8_ERR14 14
	#define PCRE_UTF8_ERR15 15		#define PCRE_UTF8_ERR15 15
	#define PCRE_UTF8_ERR16 16		#define PCRE_UTF8_ERR16 16
	#define PCRE_UTF8_ERR17 17		#define PCRE_UTF8_ERR17 17
	#define PCRE_UTF8_ERR18 18		#define PCRE_UTF8_ERR18 18
	#define PCRE_UTF8_ERR19 19		#define PCRE_UTF8_ERR19 19
	#define PCRE_UTF8_ERR20 20		#define PCRE_UTF8_ERR20 20
	#define PCRE_UTF8_ERR21 21		#define PCRE_UTF8_ERR21 21
			#define PCRE_UTF8_ERR22 22 /* Unused (was non-character) */
	/* Specific error codes for UTF-16 validity checks */		/* Specific error codes for UTF-16 validity checks */
	#define PCRE_UTF16_ERR0 0		#define PCRE_UTF16_ERR0 0
	#define PCRE_UTF16_ERR1 1		#define PCRE_UTF16_ERR1 1
	#define PCRE_UTF16_ERR2 2		#define PCRE_UTF16_ERR2 2
	#define PCRE_UTF16_ERR3 3		#define PCRE_UTF16_ERR3 3
	#define PCRE_UTF16_ERR4 4		#define PCRE_UTF16_ERR4 4 /* Unused (was non-character) */
			/* Specific error codes for UTF-32 validity checks */
			#define PCRE_UTF32_ERR0 0
			#define PCRE_UTF32_ERR1 1
			#define PCRE_UTF32_ERR2 2 /* Unused (was non-character) */
			#define PCRE_UTF32_ERR3 3
	/* Request types for pcre_fullinfo() */		/* Request types for pcre_fullinfo() */
	#define PCRE_INFO_OPTIONS 0		#define PCRE_INFO_OPTIONS 0
	#define PCRE_INFO_SIZE 1		#define PCRE_INFO_SIZE 1
	#define PCRE_INFO_CAPTURECOUNT 2		#define PCRE_INFO_CAPTURECOUNT 2
	#define PCRE_INFO_BACKREFMAX 3		#define PCRE_INFO_BACKREFMAX 3
	#define PCRE_INFO_FIRSTBYTE 4		#define PCRE_INFO_FIRSTBYTE 4
	#define PCRE_INFO_FIRSTCHAR 4 /* For backwards compatibility */		#define PCRE_INFO_FIRSTCHAR 4 /* For backwards compatibility */
	#define PCRE_INFO_FIRSTTABLE 5		#define PCRE_INFO_FIRSTTABLE 5
	skipping to change at line 237		skipping to change at line 276
	#define PCRE_INFO_NAMECOUNT 8		#define PCRE_INFO_NAMECOUNT 8
	#define PCRE_INFO_NAMETABLE 9		#define PCRE_INFO_NAMETABLE 9
	#define PCRE_INFO_STUDYSIZE 10		#define PCRE_INFO_STUDYSIZE 10
	#define PCRE_INFO_DEFAULT_TABLES 11		#define PCRE_INFO_DEFAULT_TABLES 11
	#define PCRE_INFO_OKPARTIAL 12		#define PCRE_INFO_OKPARTIAL 12
	#define PCRE_INFO_JCHANGED 13		#define PCRE_INFO_JCHANGED 13
	#define PCRE_INFO_HASCRORLF 14		#define PCRE_INFO_HASCRORLF 14
	#define PCRE_INFO_MINLENGTH 15		#define PCRE_INFO_MINLENGTH 15
	#define PCRE_INFO_JIT 16		#define PCRE_INFO_JIT 16
	#define PCRE_INFO_JITSIZE 17		#define PCRE_INFO_JITSIZE 17
			#define PCRE_INFO_MAXLOOKBEHIND 18
			#define PCRE_INFO_FIRSTCHARACTER 19
			#define PCRE_INFO_FIRSTCHARACTERFLAGS 20
			#define PCRE_INFO_REQUIREDCHAR 21
			#define PCRE_INFO_REQUIREDCHARFLAGS 22
			#define PCRE_INFO_MATCHLIMIT 23
			#define PCRE_INFO_RECURSIONLIMIT 24
			#define PCRE_INFO_MATCH_EMPTY 25
	/* Request types for pcre_config(). Do not re-arrange, in order to remain		/* Request types for pcre_config(). Do not re-arrange, in order to remain
	compatible. */		compatible. */
	#define PCRE_CONFIG_UTF8 0		#define PCRE_CONFIG_UTF8 0
	#define PCRE_CONFIG_NEWLINE 1		#define PCRE_CONFIG_NEWLINE 1
	#define PCRE_CONFIG_LINK_SIZE 2		#define PCRE_CONFIG_LINK_SIZE 2
	#define PCRE_CONFIG_POSIX_MALLOC_THRESHOLD 3		#define PCRE_CONFIG_POSIX_MALLOC_THRESHOLD 3
	#define PCRE_CONFIG_MATCH_LIMIT 4		#define PCRE_CONFIG_MATCH_LIMIT 4
	#define PCRE_CONFIG_STACKRECURSE 5		#define PCRE_CONFIG_STACKRECURSE 5
	#define PCRE_CONFIG_UNICODE_PROPERTIES 6		#define PCRE_CONFIG_UNICODE_PROPERTIES 6
	#define PCRE_CONFIG_MATCH_LIMIT_RECURSION 7		#define PCRE_CONFIG_MATCH_LIMIT_RECURSION 7
	#define PCRE_CONFIG_BSR 8		#define PCRE_CONFIG_BSR 8
	#define PCRE_CONFIG_JIT 9		#define PCRE_CONFIG_JIT 9
	#define PCRE_CONFIG_UTF16 10		#define PCRE_CONFIG_UTF16 10
	#define PCRE_CONFIG_JITTARGET 11		#define PCRE_CONFIG_JITTARGET 11
			#define PCRE_CONFIG_UTF32 12
			#define PCRE_CONFIG_PARENS_LIMIT 13
	/* Request types for pcre_study(). Do not re-arrange, in order to remain		/* Request types for pcre_study(). Do not re-arrange, in order to remain
	compatible. */		compatible. */
	#define PCRE_STUDY_JIT_COMPILE 0x0001		#define PCRE_STUDY_JIT_COMPILE 0x0001
			#define PCRE_STUDY_JIT_PARTIAL_SOFT_COMPILE 0x0002
			#define PCRE_STUDY_JIT_PARTIAL_HARD_COMPILE 0x0004
			#define PCRE_STUDY_EXTRA_NEEDED 0x0008
	/* Bit flags for the pcre[16]_extra structure. Do not re-arrange or redefin e		/* Bit flags for the pcre[16|32]_extra structure. Do not re-arrange or rede fine
	these bits, just add new ones on the end, in order to remain compatible. */		these bits, just add new ones on the end, in order to remain compatible. */
	#define PCRE_EXTRA_STUDY_DATA 0x0001		#define PCRE_EXTRA_STUDY_DATA 0x0001
	#define PCRE_EXTRA_MATCH_LIMIT 0x0002		#define PCRE_EXTRA_MATCH_LIMIT 0x0002
	#define PCRE_EXTRA_CALLOUT_DATA 0x0004		#define PCRE_EXTRA_CALLOUT_DATA 0x0004
	#define PCRE_EXTRA_TABLES 0x0008		#define PCRE_EXTRA_TABLES 0x0008
	#define PCRE_EXTRA_MATCH_LIMIT_RECURSION 0x0010		#define PCRE_EXTRA_MATCH_LIMIT_RECURSION 0x0010
	#define PCRE_EXTRA_MARK 0x0020		#define PCRE_EXTRA_MARK 0x0020
	#define PCRE_EXTRA_EXECUTABLE_JIT 0x0040		#define PCRE_EXTRA_EXECUTABLE_JIT 0x0040
	/* Types */		/* Types */
	struct real_pcre; /* declaration; the definition is private */		struct real_pcre; /* declaration; the definition is private */
	typedef struct real_pcre pcre;		typedef struct real_pcre pcre;
	struct real_pcre16; /* declaration; the definition is private */		struct real_pcre16; /* declaration; the definition is private */
	typedef struct real_pcre16 pcre16;		typedef struct real_pcre16 pcre16;
			struct real_pcre32; /* declaration; the definition is private
			*/
			typedef struct real_pcre32 pcre32;
	struct real_pcre_jit_stack; /* declaration; the definition is private */		struct real_pcre_jit_stack; /* declaration; the definition is private */
	typedef struct real_pcre_jit_stack pcre_jit_stack;		typedef struct real_pcre_jit_stack pcre_jit_stack;
	struct real_pcre16_jit_stack; /* declaration; the definition is private */		struct real_pcre16_jit_stack; /* declaration; the definition is private */
	typedef struct real_pcre16_jit_stack pcre16_jit_stack;		typedef struct real_pcre16_jit_stack pcre16_jit_stack;
			struct real_pcre32_jit_stack; /* declaration; the definition is private
			*/
			typedef struct real_pcre32_jit_stack pcre32_jit_stack;
	/* If PCRE is compiled with 16 bit character support, PCRE_UCHAR16 must con tain		/* If PCRE is compiled with 16 bit character support, PCRE_UCHAR16 must con tain
	a 16 bit wide signed data type. Otherwise it can be a dummy data type since		a 16 bit wide signed data type. Otherwise it can be a dummy data type since
	pcre16 functions are not implemented. There is a check for this in pcre_int ernal.h. */		pcre16 functions are not implemented. There is a check for this in pcre_int ernal.h. */
	#ifndef PCRE_UCHAR16		#ifndef PCRE_UCHAR16
	#define PCRE_UCHAR16 unsigned short		#define PCRE_UCHAR16 unsigned short
	#endif		#endif
	#ifndef PCRE_SPTR16		#ifndef PCRE_SPTR16
	#define PCRE_SPTR16 const PCRE_UCHAR16 *		#define PCRE_SPTR16 const PCRE_UCHAR16 *
	#endif		#endif
			/* If PCRE is compiled with 32 bit character support, PCRE_UCHAR32 must con
			tain
			a 32 bit wide signed data type. Otherwise it can be a dummy data type since
			pcre32 functions are not implemented. There is a check for this in pcre_int
			ernal.h. */
			#ifndef PCRE_UCHAR32
			#define PCRE_UCHAR32 unsigned int
			#endif
			#ifndef PCRE_SPTR32
			#define PCRE_SPTR32 const PCRE_UCHAR32 *
			#endif
	/* When PCRE is compiled as a C++ library, the subject pointer type can be		/* When PCRE is compiled as a C++ library, the subject pointer type can be
	replaced with a custom type. For conventional use, the public interface is a		replaced with a custom type. For conventional use, the public interface is a
	const char *. */		const char *. */
	#ifndef PCRE_SPTR		#ifndef PCRE_SPTR
	#define PCRE_SPTR const char *		#define PCRE_SPTR const char *
	#endif		#endif
	/* The structure for passing additional data to pcre_exec(). This is define d in		/* The structure for passing additional data to pcre_exec(). This is define d in
	such as way as to be extensible. Always add new fields at the end, in order to		such as way as to be extensible. Always add new fields at the end, in order to
	skipping to change at line 331		skipping to change at line 400
	unsigned long int flags; /* Bits for which fields are set */		unsigned long int flags; /* Bits for which fields are set */
	void *study_data; /* Opaque data from pcre_study() */		void *study_data; /* Opaque data from pcre_study() */
	unsigned long int match_limit; /* Maximum number of calls to match() */		unsigned long int match_limit; /* Maximum number of calls to match() */
	void *callout_data; /* Data passed back in callouts */		void *callout_data; /* Data passed back in callouts */
	const unsigned char *tables; /* Pointer to character tables */		const unsigned char *tables; /* Pointer to character tables */
	unsigned long int match_limit_recursion; /* Max recursive calls to match( ) */		unsigned long int match_limit_recursion; /* Max recursive calls to match( ) */
	PCRE_UCHAR16 **mark; /* For passing back a mark pointer */		PCRE_UCHAR16 **mark; /* For passing back a mark pointer */
	void *executable_jit; /* Contains a pointer to a compiled jit c ode */		void *executable_jit; /* Contains a pointer to a compiled jit c ode */
	} pcre16_extra;		} pcre16_extra;
			/* Same structure as above, but with 32 bit char pointers. */
			typedef struct pcre32_extra {
			unsigned long int flags; /* Bits for which fields are set */
			void *study_data; /* Opaque data from pcre_study() */
			unsigned long int match_limit; /* Maximum number of calls to match() */
			void *callout_data; /* Data passed back in callouts */
			const unsigned char *tables; /* Pointer to character tables */
			unsigned long int match_limit_recursion; /* Max recursive calls to match(
			) */
			PCRE_UCHAR32 **mark; /* For passing back a mark pointer */
			void *executable_jit; /* Contains a pointer to a compiled jit c
			ode */
			} pcre32_extra;
	/* The structure for passing out data via the pcre_callout_function. We use a		/* The structure for passing out data via the pcre_callout_function. We use a
	structure so that new fields can be added on the end in future versions,		structure so that new fields can be added on the end in future versions,
	without changing the API of the function, thereby allowing old clients to w ork		without changing the API of the function, thereby allowing old clients to w ork
	without modification. */		without modification. */
	typedef struct pcre_callout_block {		typedef struct pcre_callout_block {
	int version; /* Identifies version of block */		int version; /* Identifies version of block */
	/* ------------------------ Version 0 ------------------------------- */		/* ------------------------ Version 0 ------------------------------- */
	int callout_number; /* Number compiled into pattern */		int callout_number; /* Number compiled into pattern */
	int *offset_vector; /* The offset vector */		int *offset_vector; /* The offset vector */
	skipping to change at line 378		skipping to change at line 460
	int capture_last; /* Most recently closed capture */		int capture_last; /* Most recently closed capture */
	void *callout_data; /* Data passed in with the call */		void *callout_data; /* Data passed in with the call */
	/* ------------------- Added for Version 1 -------------------------- */		/* ------------------- Added for Version 1 -------------------------- */
	int pattern_position; /* Offset to next item in the pattern */		int pattern_position; /* Offset to next item in the pattern */
	int next_item_length; /* Length of next item in the pattern */		int next_item_length; /* Length of next item in the pattern */
	/* ------------------- Added for Version 2 -------------------------- */		/* ------------------- Added for Version 2 -------------------------- */
	const PCRE_UCHAR16 *mark; /* Pointer to current mark or NULL */		const PCRE_UCHAR16 *mark; /* Pointer to current mark or NULL */
	/* ------------------------------------------------------------------ */		/* ------------------------------------------------------------------ */
	} pcre16_callout_block;		} pcre16_callout_block;
			/* Same structure as above, but with 32 bit char pointers. */
			typedef struct pcre32_callout_block {
			int version; /* Identifies version of block */
			/* ------------------------ Version 0 ------------------------------- */
			int callout_number; /* Number compiled into pattern */
			int *offset_vector; /* The offset vector */
			PCRE_SPTR32 subject; /* The subject being matched */
			int subject_length; /* The length of the subject */
			int start_match; /* Offset to start of this match attempt
			*/
			int current_position; /* Where we currently are in the subject
			*/
			int capture_top; /* Max current capture */
			int capture_last; /* Most recently closed capture */
			void *callout_data; /* Data passed in with the call */
			/* ------------------- Added for Version 1 -------------------------- */
			int pattern_position; /* Offset to next item in the pattern */
			int next_item_length; /* Length of next item in the pattern */
			/* ------------------- Added for Version 2 -------------------------- */
			const PCRE_UCHAR32 *mark; /* Pointer to current mark or NULL */
			/* ------------------------------------------------------------------ */
			} pcre32_callout_block;
	/* Indirection for store get and free functions. These can be set to		/* Indirection for store get and free functions. These can be set to
	alternative malloc/free functions if required. Special ones are used in the		alternative malloc/free functions if required. Special ones are used in the
	non-recursive case for "frames". There is also an optional callout function		non-recursive case for "frames". There is also an optional callout function
	that is triggered by the (?) regex item. For Virtual Pascal, these definiti ons		that is triggered by the (?) regex item. For Virtual Pascal, these definiti ons
	have to take another form. */		have to take another form. */
	#ifndef VPCOMPAT		#ifndef VPCOMPAT
	PCRE_EXP_DECL void *(*pcre_malloc)(size_t);		PCRE_EXP_DECL void *(*pcre_malloc)(size_t);
	PCRE_EXP_DECL void (*pcre_free)(void *);		PCRE_EXP_DECL void (*pcre_free)(void *);
	PCRE_EXP_DECL void *(*pcre_stack_malloc)(size_t);		PCRE_EXP_DECL void *(*pcre_stack_malloc)(size_t);
	PCRE_EXP_DECL void (*pcre_stack_free)(void *);		PCRE_EXP_DECL void (*pcre_stack_free)(void *);
	PCRE_EXP_DECL int (*pcre_callout)(pcre_callout_block *);		PCRE_EXP_DECL int (*pcre_callout)(pcre_callout_block *);
			PCRE_EXP_DECL int (*pcre_stack_guard)(void);
	PCRE_EXP_DECL void *(*pcre16_malloc)(size_t);		PCRE_EXP_DECL void *(*pcre16_malloc)(size_t);
	PCRE_EXP_DECL void (*pcre16_free)(void *);		PCRE_EXP_DECL void (*pcre16_free)(void *);
	PCRE_EXP_DECL void *(*pcre16_stack_malloc)(size_t);		PCRE_EXP_DECL void *(*pcre16_stack_malloc)(size_t);
	PCRE_EXP_DECL void (*pcre16_stack_free)(void *);		PCRE_EXP_DECL void (*pcre16_stack_free)(void *);
	PCRE_EXP_DECL int (*pcre16_callout)(pcre16_callout_block *);		PCRE_EXP_DECL int (*pcre16_callout)(pcre16_callout_block *);
			PCRE_EXP_DECL int (*pcre16_stack_guard)(void);
			PCRE_EXP_DECL void *(*pcre32_malloc)(size_t);
			PCRE_EXP_DECL void (*pcre32_free)(void *);
			PCRE_EXP_DECL void *(*pcre32_stack_malloc)(size_t);
			PCRE_EXP_DECL void (*pcre32_stack_free)(void *);
			PCRE_EXP_DECL int (*pcre32_callout)(pcre32_callout_block *);
			PCRE_EXP_DECL int (*pcre32_stack_guard)(void);
	#else /* VPCOMPAT */		#else /* VPCOMPAT */
	PCRE_EXP_DECL void *pcre_malloc(size_t);		PCRE_EXP_DECL void *pcre_malloc(size_t);
	PCRE_EXP_DECL void pcre_free(void *);		PCRE_EXP_DECL void pcre_free(void *);
	PCRE_EXP_DECL void *pcre_stack_malloc(size_t);		PCRE_EXP_DECL void *pcre_stack_malloc(size_t);
	PCRE_EXP_DECL void pcre_stack_free(void *);		PCRE_EXP_DECL void pcre_stack_free(void *);
	PCRE_EXP_DECL int pcre_callout(pcre_callout_block *);		PCRE_EXP_DECL int pcre_callout(pcre_callout_block *);
			PCRE_EXP_DECL int pcre_stack_guard(void);
	PCRE_EXP_DECL void *pcre16_malloc(size_t);		PCRE_EXP_DECL void *pcre16_malloc(size_t);
	PCRE_EXP_DECL void pcre16_free(void *);		PCRE_EXP_DECL void pcre16_free(void *);
	PCRE_EXP_DECL void *pcre16_stack_malloc(size_t);		PCRE_EXP_DECL void *pcre16_stack_malloc(size_t);
	PCRE_EXP_DECL void pcre16_stack_free(void *);		PCRE_EXP_DECL void pcre16_stack_free(void *);
	PCRE_EXP_DECL int pcre16_callout(pcre16_callout_block *);		PCRE_EXP_DECL int pcre16_callout(pcre16_callout_block *);
			PCRE_EXP_DECL int pcre16_stack_guard(void);
			PCRE_EXP_DECL void *pcre32_malloc(size_t);
			PCRE_EXP_DECL void pcre32_free(void *);
			PCRE_EXP_DECL void *pcre32_stack_malloc(size_t);
			PCRE_EXP_DECL void pcre32_stack_free(void *);
			PCRE_EXP_DECL int pcre32_callout(pcre32_callout_block *);
			PCRE_EXP_DECL int pcre32_stack_guard(void);
	#endif /* VPCOMPAT */		#endif /* VPCOMPAT */
	/* User defined callback which provides a stack just before the match start s. */		/* User defined callback which provides a stack just before the match start s. */
	typedef pcre_jit_stack *(*pcre_jit_callback)(void *);		typedef pcre_jit_stack *(*pcre_jit_callback)(void *);
	typedef pcre16_jit_stack *(*pcre16_jit_callback)(void *);		typedef pcre16_jit_stack *(*pcre16_jit_callback)(void *);
			typedef pcre32_jit_stack *(*pcre32_jit_callback)(void *);
	/* Exported PCRE functions */		/* Exported PCRE functions */
	PCRE_EXP_DECL pcre *pcre_compile(const char *, int, const char **, int *,		PCRE_EXP_DECL pcre *pcre_compile(const char *, int, const char **, int *,
	const unsigned char *);		const unsigned char *);
	PCRE_EXP_DECL pcre16 *pcre16_compile(PCRE_SPTR16, int, const char **, int * ,		PCRE_EXP_DECL pcre16 *pcre16_compile(PCRE_SPTR16, int, const char **, int * ,
	const unsigned char *);		const unsigned char *);
			PCRE_EXP_DECL pcre32 *pcre32_compile(PCRE_SPTR32, int, const char **, int *
			,
			const unsigned char *);
	PCRE_EXP_DECL pcre *pcre_compile2(const char *, int, int *, const char **,		PCRE_EXP_DECL pcre *pcre_compile2(const char *, int, int *, const char **,
	int *, const unsigned char *);		int *, const unsigned char *);
	PCRE_EXP_DECL pcre16 *pcre16_compile2(PCRE_SPTR16, int, int *, const char * *,		PCRE_EXP_DECL pcre16 *pcre16_compile2(PCRE_SPTR16, int, int *, const char * *,
	int *, const unsigned char *);		int *, const unsigned char *);
			PCRE_EXP_DECL pcre32 *pcre32_compile2(PCRE_SPTR32, int, int *, const char *
			*,
			int *, const unsigned char *);
	PCRE_EXP_DECL int pcre_config(int, void *);		PCRE_EXP_DECL int pcre_config(int, void *);
	PCRE_EXP_DECL int pcre16_config(int, void *);		PCRE_EXP_DECL int pcre16_config(int, void *);
			PCRE_EXP_DECL int pcre32_config(int, void *);
	PCRE_EXP_DECL int pcre_copy_named_substring(const pcre *, const char *,		PCRE_EXP_DECL int pcre_copy_named_substring(const pcre *, const char *,
	int *, int, const char *, char *, int);		int *, int, const char *, char *, int);
	PCRE_EXP_DECL int pcre16_copy_named_substring(const pcre16 *, PCRE_SPTR16,		PCRE_EXP_DECL int pcre16_copy_named_substring(const pcre16 *, PCRE_SPTR16,
	int *, int, PCRE_SPTR16, PCRE_UCHAR16 *, int);		int *, int, PCRE_SPTR16, PCRE_UCHAR16 *, int);
			PCRE_EXP_DECL int pcre32_copy_named_substring(const pcre32 *, PCRE_SPTR32,
			int *, int, PCRE_SPTR32, PCRE_UCHAR32 *, int);
	PCRE_EXP_DECL int pcre_copy_substring(const char *, int *, int, int,		PCRE_EXP_DECL int pcre_copy_substring(const char *, int *, int, int,
	char *, int);		char *, int);
	PCRE_EXP_DECL int pcre16_copy_substring(PCRE_SPTR16, int *, int, int,		PCRE_EXP_DECL int pcre16_copy_substring(PCRE_SPTR16, int *, int, int,
	PCRE_UCHAR16 *, int);		PCRE_UCHAR16 *, int);
			PCRE_EXP_DECL int pcre32_copy_substring(PCRE_SPTR32, int *, int, int,
			PCRE_UCHAR32 *, int);
	PCRE_EXP_DECL int pcre_dfa_exec(const pcre *, const pcre_extra *,		PCRE_EXP_DECL int pcre_dfa_exec(const pcre *, const pcre_extra *,
	const char *, int, int, int, int *, int , int *, int);		const char *, int, int, int, int *, int , int *, int);
	PCRE_EXP_DECL int pcre16_dfa_exec(const pcre16 *, const pcre16_extra *,		PCRE_EXP_DECL int pcre16_dfa_exec(const pcre16 *, const pcre16_extra *,
	PCRE_SPTR16, int, int, int, int *, int , int *, int);		PCRE_SPTR16, int, int, int, int *, int , int *, int);
			PCRE_EXP_DECL int pcre32_dfa_exec(const pcre32 *, const pcre32_extra *,
			PCRE_SPTR32, int, int, int, int *, int , int *, int);
	PCRE_EXP_DECL int pcre_exec(const pcre *, const pcre_extra *, PCRE_SPTR,		PCRE_EXP_DECL int pcre_exec(const pcre *, const pcre_extra *, PCRE_SPTR,
	int, int, int, int *, int);		int, int, int, int *, int);
	PCRE_EXP_DECL int pcre16_exec(const pcre16 *, const pcre16_extra *,		PCRE_EXP_DECL int pcre16_exec(const pcre16 *, const pcre16_extra *,
	PCRE_SPTR16, int, int, int, int *, int);		PCRE_SPTR16, int, int, int, int *, int);
			PCRE_EXP_DECL int pcre32_exec(const pcre32 *, const pcre32_extra *,
			PCRE_SPTR32, int, int, int, int *, int);
			PCRE_EXP_DECL int pcre_jit_exec(const pcre *, const pcre_extra *,
			PCRE_SPTR, int, int, int, int *, int,
			pcre_jit_stack *);
			PCRE_EXP_DECL int pcre16_jit_exec(const pcre16 *, const pcre16_extra *,
			PCRE_SPTR16, int, int, int, int *, int,
			pcre16_jit_stack *);
			PCRE_EXP_DECL int pcre32_jit_exec(const pcre32 *, const pcre32_extra *,
			PCRE_SPTR32, int, int, int, int *, int,
			pcre32_jit_stack *);
	PCRE_EXP_DECL void pcre_free_substring(const char *);		PCRE_EXP_DECL void pcre_free_substring(const char *);
	PCRE_EXP_DECL void pcre16_free_substring(PCRE_SPTR16);		PCRE_EXP_DECL void pcre16_free_substring(PCRE_SPTR16);
			PCRE_EXP_DECL void pcre32_free_substring(PCRE_SPTR32);
	PCRE_EXP_DECL void pcre_free_substring_list(const char **);		PCRE_EXP_DECL void pcre_free_substring_list(const char **);
	PCRE_EXP_DECL void pcre16_free_substring_list(PCRE_SPTR16 *);		PCRE_EXP_DECL void pcre16_free_substring_list(PCRE_SPTR16 *);
			PCRE_EXP_DECL void pcre32_free_substring_list(PCRE_SPTR32 *);
	PCRE_EXP_DECL int pcre_fullinfo(const pcre *, const pcre_extra *, int,		PCRE_EXP_DECL int pcre_fullinfo(const pcre *, const pcre_extra *, int,
	void *);		void *);
	PCRE_EXP_DECL int pcre16_fullinfo(const pcre16 *, const pcre16_extra *, in t,		PCRE_EXP_DECL int pcre16_fullinfo(const pcre16 *, const pcre16_extra *, in t,
	void *);		void *);
			PCRE_EXP_DECL int pcre32_fullinfo(const pcre32 *, const pcre32_extra *, in
			t,
			void *);
	PCRE_EXP_DECL int pcre_get_named_substring(const pcre *, const char *,		PCRE_EXP_DECL int pcre_get_named_substring(const pcre *, const char *,
	int *, int, const char *, const char **);		int *, int, const char *, const char **);
	PCRE_EXP_DECL int pcre16_get_named_substring(const pcre16 *, PCRE_SPTR16,		PCRE_EXP_DECL int pcre16_get_named_substring(const pcre16 *, PCRE_SPTR16,
	int *, int, PCRE_SPTR16, PCRE_SPTR16 *);		int *, int, PCRE_SPTR16, PCRE_SPTR16 *);
			PCRE_EXP_DECL int pcre32_get_named_substring(const pcre32 *, PCRE_SPTR32,
			int *, int, PCRE_SPTR32, PCRE_SPTR32 *);
	PCRE_EXP_DECL int pcre_get_stringnumber(const pcre *, const char *);		PCRE_EXP_DECL int pcre_get_stringnumber(const pcre *, const char *);
	PCRE_EXP_DECL int pcre16_get_stringnumber(const pcre16 *, PCRE_SPTR16);		PCRE_EXP_DECL int pcre16_get_stringnumber(const pcre16 *, PCRE_SPTR16);
			PCRE_EXP_DECL int pcre32_get_stringnumber(const pcre32 *, PCRE_SPTR32);
	PCRE_EXP_DECL int pcre_get_stringtable_entries(const pcre *, const char *,		PCRE_EXP_DECL int pcre_get_stringtable_entries(const pcre *, const char *,
	char **, char **);		char **, char **);
	PCRE_EXP_DECL int pcre16_get_stringtable_entries(const pcre16 *, PCRE_SPTR 16,		PCRE_EXP_DECL int pcre16_get_stringtable_entries(const pcre16 *, PCRE_SPTR 16,
	PCRE_UCHAR16 **, PCRE_UCHAR16 **);		PCRE_UCHAR16 **, PCRE_UCHAR16 **);
			PCRE_EXP_DECL int pcre32_get_stringtable_entries(const pcre32 *, PCRE_SPTR
			32,
			PCRE_UCHAR32 **, PCRE_UCHAR32 **);
	PCRE_EXP_DECL int pcre_get_substring(const char *, int *, int, int,		PCRE_EXP_DECL int pcre_get_substring(const char *, int *, int, int,
	const char **);		const char **);
	PCRE_EXP_DECL int pcre16_get_substring(PCRE_SPTR16, int *, int, int,		PCRE_EXP_DECL int pcre16_get_substring(PCRE_SPTR16, int *, int, int,
	PCRE_SPTR16 *);		PCRE_SPTR16 *);
			PCRE_EXP_DECL int pcre32_get_substring(PCRE_SPTR32, int *, int, int,
			PCRE_SPTR32 *);
	PCRE_EXP_DECL int pcre_get_substring_list(const char *, int *, int,		PCRE_EXP_DECL int pcre_get_substring_list(const char *, int *, int,
	const char ***);		const char ***);
	PCRE_EXP_DECL int pcre16_get_substring_list(PCRE_SPTR16, int *, int,		PCRE_EXP_DECL int pcre16_get_substring_list(PCRE_SPTR16, int *, int,
	PCRE_SPTR16 **);		PCRE_SPTR16 **);
			PCRE_EXP_DECL int pcre32_get_substring_list(PCRE_SPTR32, int *, int,
			PCRE_SPTR32 **);
	PCRE_EXP_DECL const unsigned char *pcre_maketables(void);		PCRE_EXP_DECL const unsigned char *pcre_maketables(void);
	PCRE_EXP_DECL const unsigned char *pcre16_maketables(void);		PCRE_EXP_DECL const unsigned char *pcre16_maketables(void);
			PCRE_EXP_DECL const unsigned char *pcre32_maketables(void);
	PCRE_EXP_DECL int pcre_refcount(pcre *, int);		PCRE_EXP_DECL int pcre_refcount(pcre *, int);
	PCRE_EXP_DECL int pcre16_refcount(pcre16 *, int);		PCRE_EXP_DECL int pcre16_refcount(pcre16 *, int);
			PCRE_EXP_DECL int pcre32_refcount(pcre32 *, int);
	PCRE_EXP_DECL pcre_extra *pcre_study(const pcre *, int, const char **);		PCRE_EXP_DECL pcre_extra *pcre_study(const pcre *, int, const char **);
	PCRE_EXP_DECL pcre16_extra *pcre16_study(const pcre16 *, int, const char ** );		PCRE_EXP_DECL pcre16_extra *pcre16_study(const pcre16 *, int, const char ** );
			PCRE_EXP_DECL pcre32_extra *pcre32_study(const pcre32 *, int, const char ** );
	PCRE_EXP_DECL void pcre_free_study(pcre_extra *);		PCRE_EXP_DECL void pcre_free_study(pcre_extra *);
	PCRE_EXP_DECL void pcre16_free_study(pcre16_extra *);		PCRE_EXP_DECL void pcre16_free_study(pcre16_extra *);
			PCRE_EXP_DECL void pcre32_free_study(pcre32_extra *);
	PCRE_EXP_DECL const char *pcre_version(void);		PCRE_EXP_DECL const char *pcre_version(void);
	PCRE_EXP_DECL const char *pcre16_version(void);		PCRE_EXP_DECL const char *pcre16_version(void);
			PCRE_EXP_DECL const char *pcre32_version(void);
	/* Utility functions for byte order swaps. */		/* Utility functions for byte order swaps. */
	PCRE_EXP_DECL int pcre_pattern_to_host_byte_order(pcre *, pcre_extra *,		PCRE_EXP_DECL int pcre_pattern_to_host_byte_order(pcre *, pcre_extra *,
	const unsigned char *);		const unsigned char *);
	PCRE_EXP_DECL int pcre16_pattern_to_host_byte_order(pcre16 *, pcre16_extra *,		PCRE_EXP_DECL int pcre16_pattern_to_host_byte_order(pcre16 *, pcre16_extra *,
	const unsigned char *);		const unsigned char *);
			PCRE_EXP_DECL int pcre32_pattern_to_host_byte_order(pcre32 *, pcre32_extra
			*,
			const unsigned char *);
	PCRE_EXP_DECL int pcre16_utf16_to_host_byte_order(PCRE_UCHAR16 *,		PCRE_EXP_DECL int pcre16_utf16_to_host_byte_order(PCRE_UCHAR16 *,
	PCRE_SPTR16, int, int *, int);		PCRE_SPTR16, int, int *, int);
			PCRE_EXP_DECL int pcre32_utf32_to_host_byte_order(PCRE_UCHAR32 *,
			PCRE_SPTR32, int, int *, int);
	/* JIT compiler related functions. */		/* JIT compiler related functions. */
	PCRE_EXP_DECL pcre_jit_stack *pcre_jit_stack_alloc(int, int);		PCRE_EXP_DECL pcre_jit_stack *pcre_jit_stack_alloc(int, int);
	PCRE_EXP_DECL pcre16_jit_stack *pcre16_jit_stack_alloc(int, int);		PCRE_EXP_DECL pcre16_jit_stack *pcre16_jit_stack_alloc(int, int);
			PCRE_EXP_DECL pcre32_jit_stack *pcre32_jit_stack_alloc(int, int);
	PCRE_EXP_DECL void pcre_jit_stack_free(pcre_jit_stack *);		PCRE_EXP_DECL void pcre_jit_stack_free(pcre_jit_stack *);
	PCRE_EXP_DECL void pcre16_jit_stack_free(pcre16_jit_stack *);		PCRE_EXP_DECL void pcre16_jit_stack_free(pcre16_jit_stack *);
			PCRE_EXP_DECL void pcre32_jit_stack_free(pcre32_jit_stack *);
	PCRE_EXP_DECL void pcre_assign_jit_stack(pcre_extra *,		PCRE_EXP_DECL void pcre_assign_jit_stack(pcre_extra *,
	pcre_jit_callback, void *);		pcre_jit_callback, void *);
	PCRE_EXP_DECL void pcre16_assign_jit_stack(pcre16_extra *,		PCRE_EXP_DECL void pcre16_assign_jit_stack(pcre16_extra *,
	pcre16_jit_callback, void *);		pcre16_jit_callback, void *);
			PCRE_EXP_DECL void pcre32_assign_jit_stack(pcre32_extra *,
			pcre32_jit_callback, void *);
			PCRE_EXP_DECL void pcre_jit_free_unused_memory(void);
			PCRE_EXP_DECL void pcre16_jit_free_unused_memory(void);
			PCRE_EXP_DECL void pcre32_jit_free_unused_memory(void);
	#ifdef __cplusplus		#ifdef __cplusplus
	} /* extern "C" */		} /* extern "C" */
	#endif		#endif
	#endif /* End of pcre.h */		#endif /* End of pcre.h */
End of changes. 50 change blocks.
	71 lines changed or deleted		259 lines changed or added

	pcre_stringpiece.h		pcre_stringpiece.h
	skipping to change at line 177		skipping to change at line 177
	template<> struct __type_traits<pcrecpp::StringPiece> {		template<> struct __type_traits<pcrecpp::StringPiece> {
	typedef __true_type has_trivial_default_constructor;		typedef __true_type has_trivial_default_constructor;
	typedef __true_type has_trivial_copy_constructor;		typedef __true_type has_trivial_copy_constructor;
	typedef __true_type has_trivial_assignment_operator;		typedef __true_type has_trivial_assignment_operator;
	typedef __true_type has_trivial_destructor;		typedef __true_type has_trivial_destructor;
	typedef __true_type is_POD_type;		typedef __true_type is_POD_type;
	};		};
	#endif		#endif
	// allow StringPiece to be logged		// allow StringPiece to be logged
	std::ostream& operator<<(std::ostream& o, const pcrecpp::StringPiece& piece		PCRECPP_EXP_DECL std::ostream& operator<<(std::ostream& o,
	);		const pcrecpp::StringPiece& piece
			);
	#endif /* _PCRE_STRINGPIECE_H */		#endif /* _PCRE_STRINGPIECE_H */
End of changes. 1 change blocks.
	2 lines changed or deleted		3 lines changed or added

	plan_enumerator.h		plan_enumerator.h
	skipping to change at line 390		skipping to change at line 390
	*/		*/
	void enumerateOneIndex(const IndexToPredMap& idxToFirst,		void enumerateOneIndex(const IndexToPredMap& idxToFirst,
	const IndexToPredMap& idxToNotFirst,		const IndexToPredMap& idxToNotFirst,
	const vector<MemoID>& subnodes,		const vector<MemoID>& subnodes,
	AndAssignment* andAssignment);		AndAssignment* andAssignment);
	/**		/**
	* Generate single-index assignments for queries which contain mand atory		* Generate single-index assignments for queries which contain mand atory
	* predicates (TEXT and GEO_NEAR, which are required to use a compa tible index).		* predicates (TEXT and GEO_NEAR, which are required to use a compa tible index).
	* Outputs these assignments into 'andAssignment'.		* Outputs these assignments into 'andAssignment'.
			*
			* Returns true if it generated at least one assignment, and false
			if no assignment
			* of 'mandatoryPred' is possible.
	*/		*/
	void enumerateMandatoryIndex(const IndexToPredMap& idxToFirst,		bool enumerateMandatoryIndex(const IndexToPredMap& idxToFirst,
	const IndexToPredMap& idxToNotFirst,		const IndexToPredMap& idxToNotFirst,
	MatchExpression* mandatoryPred,		MatchExpression* mandatoryPred,
	const set<IndexID>& mandatoryIndices,		const set<IndexID>& mandatoryIndices,
	AndAssignment* andAssignment);		AndAssignment* andAssignment);
	/**		/**
	* Try to assign predicates in 'tryCompound' to 'thisIndex' as comp ound assignments.		* Try to assign predicates in 'tryCompound' to 'thisIndex' as comp ound assignments.
	* Output the assignments in 'assign'.		* Output the assignments in 'assign'.
	*/		*/
	void compound(const vector<MatchExpression*>& tryCompound,		void compound(const vector<MatchExpression*>& tryCompound,
End of changes. 2 change blocks.
	1 lines changed or deleted		5 lines changed or added

	ssl_options.h		ssl_options.h
	skipping to change at line 40		skipping to change at line 40
	struct MONGO_CLIENT_API SSLGlobalParams {		struct MONGO_CLIENT_API SSLGlobalParams {
	AtomicInt32 sslMode; // --sslMode - the SSL operation mode, see enum SSLModes		AtomicInt32 sslMode; // --sslMode - the SSL operation mode, see enum SSLModes
	bool sslOnNormalPorts; // --sslOnNormalPorts (deprecated)		bool sslOnNormalPorts; // --sslOnNormalPorts (deprecated)
	std::string sslPEMKeyFile; // --sslPEMKeyFile		std::string sslPEMKeyFile; // --sslPEMKeyFile
	std::string sslPEMKeyPassword; // --sslPEMKeyPassword		std::string sslPEMKeyPassword; // --sslPEMKeyPassword
	std::string sslClusterFile; // --sslInternalKeyFile		std::string sslClusterFile; // --sslInternalKeyFile
	std::string sslClusterPassword; // --sslInternalKeyPassword		std::string sslClusterPassword; // --sslInternalKeyPassword
	std::string sslCAFile; // --sslCAFile		std::string sslCAFile; // --sslCAFile
	std::string sslCRLFile; // --sslCRLFile		std::string sslCRLFile; // --sslCRLFile
			std::string sslCipherConfig; // --sslCipherConfig
	bool sslWeakCertificateValidation; // --sslWeakCertificateValidatio n		bool sslWeakCertificateValidation; // --sslWeakCertificateValidatio n
	bool sslFIPSMode; // --sslFIPSMode		bool sslFIPSMode; // --sslFIPSMode
	bool sslAllowInvalidCertificates; // --sslAllowInvalidCertificates		bool sslAllowInvalidCertificates; // --sslAllowInvalidCertificates
	bool sslAllowInvalidHostnames; // --sslAllowInvalidHostnames		bool sslAllowInvalidHostnames; // --sslAllowInvalidHostnames
	SSLGlobalParams() {		SSLGlobalParams() {
	sslMode.store(SSLMode_disabled);		sslMode.store(SSLMode_disabled);
	}		}
	enum SSLModes {		enum SSLModes {
End of changes. 1 change blocks.
	0 lines changed or deleted		1 lines changed or added

	ucp.h		ucp.h
	/*************************************************		/*************************************************
	* Unicode Property Table handler *		* Unicode Property Table handler *
	*************************************************/		*************************************************/
	#ifndef _UCP_H		#ifndef _UCP_H
	#define _UCP_H		#define _UCP_H
	/* This file contains definitions of the property values that are returned by		/* This file contains definitions of the property values that are returned by
	the UCD access macros. New values that are added for new releases of Unicod e		the UCD access macros. New values that are added for new releases of Unicod e
	should always be at the end of each enum, for backwards compatibility. */		should always be at the end of each enum, for backwards compatibility.
			IMPORTANT: Note also that the specific numeric values of the enums have to
			be
			the same as the values that are generated by the maint/MultiStage2.py scrip
			t,
			where the equivalent property descriptive names are listed in vectors.
			ALSO: The specific values of the first two enums are assumed for the table
			called catposstab in pcre_compile.c. */
	/* These are the general character categories. */		/* These are the general character categories. */
	enum {		enum {
	ucp_C, /* Other */		ucp_C, /* Other */
	ucp_L, /* Letter */		ucp_L, /* Letter */
	ucp_M, /* Mark */		ucp_M, /* Mark */
	ucp_N, /* Number */		ucp_N, /* Number */
	ucp_P, /* Punctuation */		ucp_P, /* Punctuation */
	ucp_S, /* Symbol */		ucp_S, /* Symbol */
	ucp_Z /* Separator */		ucp_Z /* Separator */
	};		};
	/* These are the particular character types. */		/* These are the particular character categories. */
	enum {		enum {
	ucp_Cc, /* Control */		ucp_Cc, /* Control */
	ucp_Cf, /* Format */		ucp_Cf, /* Format */
	ucp_Cn, /* Unassigned */		ucp_Cn, /* Unassigned */
	ucp_Co, /* Private use */		ucp_Co, /* Private use */
	ucp_Cs, /* Surrogate */		ucp_Cs, /* Surrogate */
	ucp_Ll, /* Lower case letter */		ucp_Ll, /* Lower case letter */
	ucp_Lm, /* Modifier letter */		ucp_Lm, /* Modifier letter */
	ucp_Lo, /* Other letter */		ucp_Lo, /* Other letter */
	skipping to change at line 59		skipping to change at line 66
	ucp_Ps, /* Open punctuation */		ucp_Ps, /* Open punctuation */
	ucp_Sc, /* Currency symbol */		ucp_Sc, /* Currency symbol */
	ucp_Sk, /* Modifier symbol */		ucp_Sk, /* Modifier symbol */
	ucp_Sm, /* Mathematical symbol */		ucp_Sm, /* Mathematical symbol */
	ucp_So, /* Other symbol */		ucp_So, /* Other symbol */
	ucp_Zl, /* Line separator */		ucp_Zl, /* Line separator */
	ucp_Zp, /* Paragraph separator */		ucp_Zp, /* Paragraph separator */
	ucp_Zs /* Space separator */		ucp_Zs /* Space separator */
	};		};
			/* These are grapheme break properties. Note that the code for processing t
			hem
			assumes that the values are less than 16. If more values are added that tak
			e
			the number to 16 or more, the code will have to be rewritten. */
			enum {
			ucp_gbCR, /* 0 */
			ucp_gbLF, /* 1 */
			ucp_gbControl, /* 2 */
			ucp_gbExtend, /* 3 */
			ucp_gbPrepend, /* 4 */
			ucp_gbSpacingMark, /* 5 */
			ucp_gbL, /* 6 Hangul syllable type L */
			ucp_gbV, /* 7 Hangul syllable type V */
			ucp_gbT, /* 8 Hangul syllable type T */
			ucp_gbLV, /* 9 Hangul syllable type LV */
			ucp_gbLVT, /* 10 Hangul syllable type LVT */
			ucp_gbRegionalIndicator, /* 11 */
			ucp_gbOther /* 12 */
			};
	/* These are the script identifications. */		/* These are the script identifications. */
	enum {		enum {
	ucp_Arabic,		ucp_Arabic,
	ucp_Armenian,		ucp_Armenian,
	ucp_Bengali,		ucp_Bengali,
	ucp_Bopomofo,		ucp_Bopomofo,
	ucp_Braille,		ucp_Braille,
	ucp_Buginese,		ucp_Buginese,
	ucp_Buhid,		ucp_Buhid,
	skipping to change at line 160		skipping to change at line 187
	ucp_Lisu,		ucp_Lisu,
	ucp_Meetei_Mayek,		ucp_Meetei_Mayek,
	ucp_Old_South_Arabian,		ucp_Old_South_Arabian,
	ucp_Old_Turkic,		ucp_Old_Turkic,
	ucp_Samaritan,		ucp_Samaritan,
	ucp_Tai_Tham,		ucp_Tai_Tham,
	ucp_Tai_Viet,		ucp_Tai_Viet,
	/* New for Unicode 6.0.0: */		/* New for Unicode 6.0.0: */
	ucp_Batak,		ucp_Batak,
	ucp_Brahmi,		ucp_Brahmi,
	ucp_Mandaic		ucp_Mandaic,
			/* New for Unicode 6.1.0: */
			ucp_Chakma,
			ucp_Meroitic_Cursive,
			ucp_Meroitic_Hieroglyphs,
			ucp_Miao,
			ucp_Sharada,
			ucp_Sora_Sompeng,
			ucp_Takri,
			/* New for Unicode 7.0.0: */
			ucp_Bassa_Vah,
			ucp_Caucasian_Albanian,
			ucp_Duployan,
			ucp_Elbasan,
			ucp_Grantha,
			ucp_Khojki,
			ucp_Khudawadi,
			ucp_Linear_A,
			ucp_Mahajani,
			ucp_Manichaean,
			ucp_Mende_Kikakui,
			ucp_Modi,
			ucp_Mro,
			ucp_Nabataean,
			ucp_Old_North_Arabian,
			ucp_Old_Permic,
			ucp_Pahawh_Hmong,
			ucp_Palmyrene,
			ucp_Psalter_Pahlavi,
			ucp_Pau_Cin_Hau,
			ucp_Siddham,
			ucp_Tirhuta,
			ucp_Warang_Citi
	};		};
	#endif		#endif
	/* End of ucp.h */		/* End of ucp.h */
End of changes. 4 change blocks.
	3 lines changed or deleted		66 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/