attrrefs.h		attrrefs.h
	/*********************************************************************		/***************************************************************
	*		*
	* Condor ClassAd library		* Copyright (C) 1990-2007, Condor Team, Computer Sciences Department,
	* Copyright (C) 1990-2003, Condor Team, Computer Sciences Department,		* University of Wisconsin-Madison, WI.
	* University of Wisconsin-Madison, WI and Rajesh Raman.
	*		*
	* This source code is covered by the Condor Public License, which can		* Licensed under the Apache License, Version 2.0 (the "License"); you
	* be found in the accompanying LICENSE file, or online at		* may not use this file except in compliance with the License. You may
	* www.condorproject.org.		* obtain a copy of the License at
	*		*
	* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS		* http://www.apache.org/licenses/LICENSE-2.0
	* AND THE UNIVERSITY OF WISCONSIN-MADISON "AS IS" AND ANY EXPRESS OR
	* IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
	* WARRANTIES OF MERCHANTABILITY, OF SATISFACTORY QUALITY, AND FITNESS
	* FOR A PARTICULAR PURPOSE OR USE ARE DISCLAIMED. THE COPYRIGHT
	* HOLDERS AND CONTRIBUTORS AND THE UNIVERSITY OF WISCONSIN-MADISON
	* MAKE NO MAKE NO REPRESENTATION THAT THE SOFTWARE, MODIFICATIONS,
	* ENHANCEMENTS OR DERIVATIVE WORKS THEREOF, WILL NOT INFRINGE ANY
	* PATENT, COPYRIGHT, TRADEMARK, TRADE SECRET OR OTHER PROPRIETARY
	* RIGHT.
	*		*
	*********************************************************************/		* Unless required by applicable law or agreed to in writing, software
			* distributed under the License is distributed on an "AS IS" BASIS,
			* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
			* See the License for the specific language governing permissions and
			* limitations under the License.
			*
			***************************************************************/
	#ifndef __ATTRREFS_H__		#ifndef __ATTRREFS_H__
	#define __ATTRREFS_H__		#define __ATTRREFS_H__
	BEGIN_NAMESPACE( classad )		BEGIN_NAMESPACE( classad )
	/// Represents a attribute reference node (like .b) in the expression tree		/// Represents a attribute reference node (like .b) in the expression tree
	class AttributeReference : public ExprTree		class AttributeReference : public ExprTree
	{		{
	public:		public:
End of changes. 5 change blocks.
	18 lines changed or deleted		14 lines changed or added

	cclassad.h		cclassad.h
	/*********************************************************************		/***************************************************************
	*		*
	* Condor ClassAd library		* Copyright (C) 1990-2007, Condor Team, Computer Sciences Department,
	* Copyright (C) 1990-2003, Condor Team, Computer Sciences Department,		* University of Wisconsin-Madison, WI.
	* University of Wisconsin-Madison, WI and Rajesh Raman.
	*		*
	* This source code is covered by the Condor Public License, which can		* Licensed under the Apache License, Version 2.0 (the "License"); you
	* be found in the accompanying LICENSE file, or online at		* may not use this file except in compliance with the License. You may
	* www.condorproject.org.		* obtain a copy of the License at
	*		*
	* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS		* http://www.apache.org/licenses/LICENSE-2.0
	* AND THE UNIVERSITY OF WISCONSIN-MADISON "AS IS" AND ANY EXPRESS OR
	* IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
	* WARRANTIES OF MERCHANTABILITY, OF SATISFACTORY QUALITY, AND FITNESS
	* FOR A PARTICULAR PURPOSE OR USE ARE DISCLAIMED. THE COPYRIGHT
	* HOLDERS AND CONTRIBUTORS AND THE UNIVERSITY OF WISCONSIN-MADISON
	* MAKE NO MAKE NO REPRESENTATION THAT THE SOFTWARE, MODIFICATIONS,
	* ENHANCEMENTS OR DERIVATIVE WORKS THEREOF, WILL NOT INFRINGE ANY
	* PATENT, COPYRIGHT, TRADEMARK, TRADE SECRET OR OTHER PROPRIETARY
	* RIGHT.
	*		*
	*********************************************************************/		* Unless required by applicable law or agreed to in writing, software
			* distributed under the License is distributed on an "AS IS" BASIS,
			* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
			* See the License for the specific language governing permissions and
			* limitations under the License.
			*
			***************************************************************/
	#ifndef __CCLASSAD_H_		#ifndef __CCLASSAD_H_
	#define __CCLASSAD_H_		#define __CCLASSAD_H_
	/*		/*
	This is a C interface to the classad library.		This is a C interface to the classad library.
	This allows programs to use the ClassAd library in		This allows programs to use the ClassAd library in
	a compiler-independent fashion with traditional constructs		a compiler-independent fashion with traditional constructs
	such as integers and C strings. No special compiler flags		such as integers and C strings. No special compiler flags
	or other packages are necessary to use this interface.		or other packages are necessary to use this interface.
End of changes. 5 change blocks.
	18 lines changed or deleted		14 lines changed or added

	classad.h		classad.h
	/*********************************************************************		/***************************************************************
	*		*
	* Condor ClassAd library		* Copyright (C) 1990-2007, Condor Team, Computer Sciences Department,
	* Copyright (C) 1990-2003, Condor Team, Computer Sciences Department,		* University of Wisconsin-Madison, WI.
	* University of Wisconsin-Madison, WI and Rajesh Raman.
	*		*
	* This source code is covered by the Condor Public License, which can		* Licensed under the Apache License, Version 2.0 (the "License"); you
	* be found in the accompanying LICENSE file, or online at		* may not use this file except in compliance with the License. You may
	* www.condorproject.org.		* obtain a copy of the License at
	*		*
	* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS		* http://www.apache.org/licenses/LICENSE-2.0
	* AND THE UNIVERSITY OF WISCONSIN-MADISON "AS IS" AND ANY EXPRESS OR
	* IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
	* WARRANTIES OF MERCHANTABILITY, OF SATISFACTORY QUALITY, AND FITNESS
	* FOR A PARTICULAR PURPOSE OR USE ARE DISCLAIMED. THE COPYRIGHT
	* HOLDERS AND CONTRIBUTORS AND THE UNIVERSITY OF WISCONSIN-MADISON
	* MAKE NO MAKE NO REPRESENTATION THAT THE SOFTWARE, MODIFICATIONS,
	* ENHANCEMENTS OR DERIVATIVE WORKS THEREOF, WILL NOT INFRINGE ANY
	* PATENT, COPYRIGHT, TRADEMARK, TRADE SECRET OR OTHER PROPRIETARY
	* RIGHT.
	*		*
	*********************************************************************/		* Unless required by applicable law or agreed to in writing, software
			* distributed under the License is distributed on an "AS IS" BASIS,
			* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
			* See the License for the specific language governing permissions and
			* limitations under the License.
			*
			***************************************************************/
	#ifndef __CLASSAD_H__		#ifndef __CLASSAD_H__
	#define __CLASSAD_H__		#define __CLASSAD_H__
	#include <set>		#include <set>
	#include <map>		#include <map>
	#include <vector>		#include <vector>
	#include "classad_stl.h"		#include "classad/classad_stl.h"
	#include "exprTree.h"		#include "classad/exprTree.h"
	BEGIN_NAMESPACE( classad )		BEGIN_NAMESPACE( classad )
	typedef std::set<std::string, CaseIgnLTStr> References;		typedef std::set<std::string, CaseIgnLTStr> References;
	typedef std::map<const ClassAd*, References> PortReferences;		typedef std::map<const ClassAd*, References> PortReferences;
	#if defined( EXPERIMENTAL )		#if defined( EXPERIMENTAL )
	#include "rectangle.h"		#include "classad/rectangle.h"
	#endif		#endif
	#ifdef CLASSAD_DEPRECATED		#ifdef CLASSAD_DEPRECATED
	#include "stream.h"		#include "classad/stream.h"
	#endif		#endif
	typedef classad_hash_map<std::string, ExprTree*, StringCaseIgnHash, CaseIgn EqStr> AttrList;		typedef classad_hash_map<std::string, ExprTree*, StringCaseIgnHash, CaseIgn EqStr> AttrList;
	typedef std::set<std::string, CaseIgnLTStr> DirtyAttrList;		typedef std::set<std::string, CaseIgnLTStr> DirtyAttrList;
	void ClassAdLibraryVersion(int &major, int &minor, int &patch);		void ClassAdLibraryVersion(int &major, int &minor, int &patch);
	void ClassAdLibraryVersion(std::string &version_string);		void ClassAdLibraryVersion(std::string &version_string);
	/// The ClassAd object represents a parsed %ClassAd.		/// The ClassAd object represents a parsed %ClassAd.
	class ClassAd : public ExprTree		class ClassAd : public ExprTree
	skipping to change at line 816		skipping to change at line 812
	int LookupInScope( const std::string&, ExprTree*&, EvalState & ) const;		int LookupInScope( const std::string&, ExprTree*&, EvalState & ) const;
	AttrList attrList;		AttrList attrList;
	DirtyAttrList dirtyAttrList;		DirtyAttrList dirtyAttrList;
	bool do_dirty_tracking;		bool do_dirty_tracking;
	ClassAd *chained_parent_ad;		ClassAd *chained_parent_ad;
	};		};
	END_NAMESPACE // classad		END_NAMESPACE // classad
	#include "classadItor.h"		#include "classad/classadItor.h"
	#endif//__CLASSAD_H__		#endif//__CLASSAD_H__
End of changes. 9 change blocks.
	23 lines changed or deleted		19 lines changed or added

	classadErrno.h		classadErrno.h
	/*********************************************************************		/***************************************************************
	*		*
	* Condor ClassAd library		* Copyright (C) 1990-2007, Condor Team, Computer Sciences Department,
	* Copyright (C) 1990-2003, Condor Team, Computer Sciences Department,		* University of Wisconsin-Madison, WI.
	* University of Wisconsin-Madison, WI and Rajesh Raman.
	*		*
	* This source code is covered by the Condor Public License, which can		* Licensed under the Apache License, Version 2.0 (the "License"); you
	* be found in the accompanying LICENSE file, or online at		* may not use this file except in compliance with the License. You may
	* www.condorproject.org.		* obtain a copy of the License at
	*		*
	* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS		* http://www.apache.org/licenses/LICENSE-2.0
	* AND THE UNIVERSITY OF WISCONSIN-MADISON "AS IS" AND ANY EXPRESS OR
	* IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
	* WARRANTIES OF MERCHANTABILITY, OF SATISFACTORY QUALITY, AND FITNESS
	* FOR A PARTICULAR PURPOSE OR USE ARE DISCLAIMED. THE COPYRIGHT
	* HOLDERS AND CONTRIBUTORS AND THE UNIVERSITY OF WISCONSIN-MADISON
	* MAKE NO MAKE NO REPRESENTATION THAT THE SOFTWARE, MODIFICATIONS,
	* ENHANCEMENTS OR DERIVATIVE WORKS THEREOF, WILL NOT INFRINGE ANY
	* PATENT, COPYRIGHT, TRADEMARK, TRADE SECRET OR OTHER PROPRIETARY
	* RIGHT.
	*		*
	*********************************************************************/		* Unless required by applicable law or agreed to in writing, software
			* distributed under the License is distributed on an "AS IS" BASIS,
			* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
			* See the License for the specific language governing permissions and
			* limitations under the License.
			*
			***************************************************************/
	#ifndef __CLASSAD_ERRNO_H__		#ifndef __CLASSAD_ERRNO_H__
	#define __CLASSAD_ERRNO_H__		#define __CLASSAD_ERRNO_H__
	#include "common.h"		#include "classad/common.h"
	BEGIN_NAMESPACE(classad)		BEGIN_NAMESPACE(classad)
	// bring in Condor system errors used if not in Condor		// bring in Condor system errors used if not in Condor
	#if defined(CLASSAD_DISTRIBUTION)		#if defined(CLASSAD_DISTRIBUTION)
	static const int ERR_OK = 0;		static const int ERR_OK = 0;
	static const int ERR_MEM_ALLOC_FAILED = 1;		static const int ERR_MEM_ALLOC_FAILED = 1;
	#endif		#endif
	static const int ERR_BAD_VALUE = 255;		static const int ERR_BAD_VALUE = 255;
End of changes. 6 change blocks.
	19 lines changed or deleted		15 lines changed or added

	classadItor.h		classadItor.h
	/*********************************************************************		/***************************************************************
	*		*
	* Condor ClassAd library		* Copyright (C) 1990-2007, Condor Team, Computer Sciences Department,
	* Copyright (C) 1990-2003, Condor Team, Computer Sciences Department,		* University of Wisconsin-Madison, WI.
	* University of Wisconsin-Madison, WI and Rajesh Raman.
	*		*
	* This source code is covered by the Condor Public License, which can		* Licensed under the Apache License, Version 2.0 (the "License"); you
	* be found in the accompanying LICENSE file, or online at		* may not use this file except in compliance with the License. You may
	* www.condorproject.org.		* obtain a copy of the License at
	*		*
	* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS		* http://www.apache.org/licenses/LICENSE-2.0
	* AND THE UNIVERSITY OF WISCONSIN-MADISON "AS IS" AND ANY EXPRESS OR
	* IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
	* WARRANTIES OF MERCHANTABILITY, OF SATISFACTORY QUALITY, AND FITNESS
	* FOR A PARTICULAR PURPOSE OR USE ARE DISCLAIMED. THE COPYRIGHT
	* HOLDERS AND CONTRIBUTORS AND THE UNIVERSITY OF WISCONSIN-MADISON
	* MAKE NO MAKE NO REPRESENTATION THAT THE SOFTWARE, MODIFICATIONS,
	* ENHANCEMENTS OR DERIVATIVE WORKS THEREOF, WILL NOT INFRINGE ANY
	* PATENT, COPYRIGHT, TRADEMARK, TRADE SECRET OR OTHER PROPRIETARY
	* RIGHT.
	*		*
	*********************************************************************/		* Unless required by applicable law or agreed to in writing, software
			* distributed under the License is distributed on an "AS IS" BASIS,
			* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
			* See the License for the specific language governing permissions and
			* limitations under the License.
			*
			***************************************************************/
	#ifndef __CLASSAD_ITOR_H__		#ifndef __CLASSAD_ITOR_H__
	#define __CLASSAD_ITOR_H__		#define __CLASSAD_ITOR_H__
	BEGIN_NAMESPACE( classad )		BEGIN_NAMESPACE( classad )
	/// An object for iterating over the attributes of a ClassAd--deprecated.		/// An object for iterating over the attributes of a ClassAd--deprecated.
	/// We recommend that you now use the STL-like iterators defined with		/// We recommend that you now use the STL-like iterators defined with
	/// ClassAd. Several iterators may be active over the same ClassAd at		/// ClassAd. Several iterators may be active over the same ClassAd at
	/// any time, and the same iterator object may be used to iterate over		/// any time, and the same iterator object may be used to iterate over
End of changes. 5 change blocks.
	18 lines changed or deleted		14 lines changed or added

	classad_distribution.h		classad_distribution.h
	/*********************************************************************		/***************************************************************
	*		*
	* Condor ClassAd library		* Copyright (C) 1990-2007, Condor Team, Computer Sciences Department,
	* Copyright (C) 1990-2003, Condor Team, Computer Sciences Department,		* University of Wisconsin-Madison, WI.
	* University of Wisconsin-Madison, WI and Rajesh Raman.
	*		*
	* This source code is covered by the Condor Public License, which can		* Licensed under the Apache License, Version 2.0 (the "License"); you
	* be found in the accompanying LICENSE file, or online at		* may not use this file except in compliance with the License. You may
	* www.condorproject.org.		* obtain a copy of the License at
	*		*
	* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS		* http://www.apache.org/licenses/LICENSE-2.0
	* AND THE UNIVERSITY OF WISCONSIN-MADISON "AS IS" AND ANY EXPRESS OR
	* IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
	* WARRANTIES OF MERCHANTABILITY, OF SATISFACTORY QUALITY, AND FITNESS
	* FOR A PARTICULAR PURPOSE OR USE ARE DISCLAIMED. THE COPYRIGHT
	* HOLDERS AND CONTRIBUTORS AND THE UNIVERSITY OF WISCONSIN-MADISON
	* MAKE NO MAKE NO REPRESENTATION THAT THE SOFTWARE, MODIFICATIONS,
	* ENHANCEMENTS OR DERIVATIVE WORKS THEREOF, WILL NOT INFRINGE ANY
	* PATENT, COPYRIGHT, TRADEMARK, TRADE SECRET OR OTHER PROPRIETARY
	* RIGHT.
	*		*
	*********************************************************************/		* Unless required by applicable law or agreed to in writing, software
			* distributed under the License is distributed on an "AS IS" BASIS,
			* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
			* See the License for the specific language governing permissions and
			* limitations under the License.
			*
			***************************************************************/
	#ifndef __CLASSAD_DISTRIBUTION_H__		#ifndef __CLASSAD_DISTRIBUTION_H__
	#define __CLASSAD_DISTRIBUTION_H__		#define __CLASSAD_DISTRIBUTION_H__
	#ifndef CLASSAD_DISTRIBUTION		#ifndef CLASSAD_DISTRIBUTION
	#define CLASSAD_DISTRIBUTION		#define CLASSAD_DISTRIBUTION
	#endif		#endif
	#include "common.h"		#include "classad/common.h"
	#include "classad.h"		#include "classad/classad.h"
	#include "source.h"		#include "classad/source.h"
	#include "sink.h"		#include "classad/sink.h"
	#include "xmlSource.h"		#include "classad/xmlSource.h"
	#include "xmlSink.h"		#include "classad/xmlSink.h"
	#include "matchClassad.h"		#include "classad/matchClassad.h"
	#include "collection.h"		#include "classad/collection.h"
	#include "collectionBase.h"		#include "classad/collectionBase.h"
	#include "query.h"		#include "classad/query.h"
	#endif		#endif
End of changes. 6 change blocks.
	28 lines changed or deleted		24 lines changed or added

	classad_stl.h		classad_stl.h
	/*********************************************************************		/***************************************************************
	*		*
	* Condor ClassAd library		* Copyright (C) 1990-2007, Condor Team, Computer Sciences Department,
	* Copyright (C) 1990-2003, Condor Team, Computer Sciences Department,		* University of Wisconsin-Madison, WI.
	* University of Wisconsin-Madison, WI and Rajesh Raman.
	*		*
	* This source code is covered by the Condor Public License, which can		* Licensed under the Apache License, Version 2.0 (the "License"); you
	* be found in the accompanying LICENSE file, or online at		* may not use this file except in compliance with the License. You may
	* www.condorproject.org.		* obtain a copy of the License at
	*		*
	* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS		* http://www.apache.org/licenses/LICENSE-2.0
	* AND THE UNIVERSITY OF WISCONSIN-MADISON "AS IS" AND ANY EXPRESS OR
	* IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
	* WARRANTIES OF MERCHANTABILITY, OF SATISFACTORY QUALITY, AND FITNESS
	* FOR A PARTICULAR PURPOSE OR USE ARE DISCLAIMED. THE COPYRIGHT
	* HOLDERS AND CONTRIBUTORS AND THE UNIVERSITY OF WISCONSIN-MADISON
	* MAKE NO MAKE NO REPRESENTATION THAT THE SOFTWARE, MODIFICATIONS,
	* ENHANCEMENTS OR DERIVATIVE WORKS THEREOF, WILL NOT INFRINGE ANY
	* PATENT, COPYRIGHT, TRADEMARK, TRADE SECRET OR OTHER PROPRIETARY
	* RIGHT.
	*		*
	*********************************************************************/		* Unless required by applicable law or agreed to in writing, software
			* distributed under the License is distributed on an "AS IS" BASIS,
			* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
			* See the License for the specific language governing permissions and
			* limitations under the License.
			*
			***************************************************************/
	#ifndef __CLASSAD_STL_H__		#ifndef __CLASSAD_STL_H__
	#define __CLASSAD_STL_H__		#define __CLASSAD_STL_H__
	#if USING_STLPORT		#if USING_STLPORT
	#include <hash_map>		#include <hash_map>
	#include <slist>		#include <slist>
	#elif defined(__GNUC__)		#elif defined(__GNUC__)
	#if (__GNUC__<3)		#if (__GNUC__<3)
	#include <hash_map>		#include <hash_map>
	#include <slist>		#include <slist>
	#else		#else
			#include <string>
	#include <ext/hash_map>		#include <ext/hash_map>
	#include <ext/slist>		#include <ext/slist>
	using namespace __gnu_cxx;		using namespace __gnu_cxx;
	#endif		#endif
	#elif defined(WIN32)		#elif defined(WIN32)
	#include <hash_map>		#include <hash_map>
	#include <slist>		#include <slist>
	#else		#else
	#include <hash_map>		#include <hash_map>
	#endif		#endif
End of changes. 6 change blocks.
	18 lines changed or deleted		15 lines changed or added

	collection.h		collection.h
	/*********************************************************************		/***************************************************************
	*		*
	* Condor ClassAd library		* Copyright (C) 1990-2007, Condor Team, Computer Sciences Department,
	* Copyright (C) 1990-2003, Condor Team, Computer Sciences Department,		* University of Wisconsin-Madison, WI.
	* University of Wisconsin-Madison, WI and Rajesh Raman.
	*		*
	* This source code is covered by the Condor Public License, which can		* Licensed under the Apache License, Version 2.0 (the "License"); you
	* be found in the accompanying LICENSE file, or online at		* may not use this file except in compliance with the License. You may
	* www.condorproject.org.		* obtain a copy of the License at
	*		*
	* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS		* http://www.apache.org/licenses/LICENSE-2.0
	* AND THE UNIVERSITY OF WISCONSIN-MADISON "AS IS" AND ANY EXPRESS OR
	* IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
	* WARRANTIES OF MERCHANTABILITY, OF SATISFACTORY QUALITY, AND FITNESS
	* FOR A PARTICULAR PURPOSE OR USE ARE DISCLAIMED. THE COPYRIGHT
	* HOLDERS AND CONTRIBUTORS AND THE UNIVERSITY OF WISCONSIN-MADISON
	* MAKE NO MAKE NO REPRESENTATION THAT THE SOFTWARE, MODIFICATIONS,
	* ENHANCEMENTS OR DERIVATIVE WORKS THEREOF, WILL NOT INFRINGE ANY
	* PATENT, COPYRIGHT, TRADEMARK, TRADE SECRET OR OTHER PROPRIETARY
	* RIGHT.
	*		*
	*********************************************************************/		* Unless required by applicable law or agreed to in writing, software
			* distributed under the License is distributed on an "AS IS" BASIS,
			* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
			* See the License for the specific language governing permissions and
			* limitations under the License.
			*
			***************************************************************/
	#ifndef __COLLECTION_H__		#ifndef __COLLECTION_H__
	#define __COLLECTION_H__		#define __COLLECTION_H__
	#include "view.h"		#include "classad/view.h"
	#include "source.h"		#include "classad/source.h"
	#include "sink.h"		#include "classad/sink.h"
	BEGIN_NAMESPACE( classad )		BEGIN_NAMESPACE( classad )
	class ClassAdCollectionInterface {		class ClassAdCollectionInterface {
	public:		public:
	ClassAdCollectionInterface( );		ClassAdCollectionInterface( );
	virtual ~ClassAdCollectionInterface( );		virtual ~ClassAdCollectionInterface( );
	enum {		enum {
	ClassAdCollOp_NoOp = 10000,		ClassAdCollOp_NoOp = 10000,
	skipping to change at line 199		skipping to change at line 195
	ClassAdParser parser;		ClassAdParser parser;
	ClassAdUnParser unparser;		ClassAdUnParser unparser;
	FILE *log_fp;		FILE *log_fp;
	std::string StorageFileName;		std::string StorageFileName;
	int sfiled;		int sfiled;
	// override for client and server		// override for client and server
	virtual bool LogState( FILE * ) = 0;		virtual bool LogState( FILE * ) = 0;
	private:		private:
	ClassAdCollectionInterface(const ClassAdCollectionInterface &i)		ClassAdCollectionInterface(const ClassAdCollectionInterface &)
	{ return; }		{ return; }
	ClassAdCollectionInterface &operator=(const ClassAdCollectionInterface		ClassAdCollectionInterface &operator=(const ClassAdCollectionInterface
	&i) { return *this; }		&) { return *this; }
	};		};
	END_NAMESPACE		END_NAMESPACE
	#endif		#endif
End of changes. 7 change blocks.
	25 lines changed or deleted		21 lines changed or added

	collectionBase.h		collectionBase.h
	/*********************************************************************		/***************************************************************
	*		*
	* Condor ClassAd library		* Copyright (C) 1990-2007, Condor Team, Computer Sciences Department,
	* Copyright (C) 1990-2003, Condor Team, Computer Sciences Department,		* University of Wisconsin-Madison, WI.
	* University of Wisconsin-Madison, WI and Rajesh Raman.
	*		*
	* This source code is covered by the Condor Public License, which can		* Licensed under the Apache License, Version 2.0 (the "License"); you
	* be found in the accompanying LICENSE file, or online at		* may not use this file except in compliance with the License. You may
	* www.condorproject.org.		* obtain a copy of the License at
	*		*
	* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS		* http://www.apache.org/licenses/LICENSE-2.0
	* AND THE UNIVERSITY OF WISCONSIN-MADISON "AS IS" AND ANY EXPRESS OR
	* IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
	* WARRANTIES OF MERCHANTABILITY, OF SATISFACTORY QUALITY, AND FITNESS
	* FOR A PARTICULAR PURPOSE OR USE ARE DISCLAIMED. THE COPYRIGHT
	* HOLDERS AND CONTRIBUTORS AND THE UNIVERSITY OF WISCONSIN-MADISON
	* MAKE NO MAKE NO REPRESENTATION THAT THE SOFTWARE, MODIFICATIONS,
	* ENHANCEMENTS OR DERIVATIVE WORKS THEREOF, WILL NOT INFRINGE ANY
	* PATENT, COPYRIGHT, TRADEMARK, TRADE SECRET OR OTHER PROPRIETARY
	* RIGHT.
	*		*
	*********************************************************************/		* Unless required by applicable law or agreed to in writing, software
			* distributed under the License is distributed on an "AS IS" BASIS,
			* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
			* See the License for the specific language governing permissions and
			* limitations under the License.
			*
			***************************************************************/
	#ifndef __COLLECTION_BASE_H__		#ifndef __COLLECTION_BASE_H__
	#define __COLLECTION_BASE_H__		#define __COLLECTION_BASE_H__
	#include "collection.h"		#include "classad/collection.h"
	#include "indexfile.h"		#include "classad/indexfile.h"
	#ifndef WIN32		#ifndef WIN32
	#include <sys/time.h>		#include <sys/time.h>
	#include <unistd.h>		#include <unistd.h>
	#endif		#endif
	#define MaxCacheSize 5		#define MaxCacheSize 5
	BEGIN_NAMESPACE( classad )		BEGIN_NAMESPACE( classad )
	skipping to change at line 226		skipping to change at line 222
	void MaybeSwapOutClassAd(void);		void MaybeSwapOutClassAd(void);
	int Max_Classad;		int Max_Classad;
	int CheckPoint;		int CheckPoint;
	std::map<std::string,int> DirtyClassad;		std::map<std::string,int> DirtyClassad;
	timeval LatestCheckpoint;		timeval LatestCheckpoint;
	std::string CheckFileName;		std::string CheckFileName;
	int test_checkpoint;		int test_checkpoint;
	private:		private:
	ClassAdCollection(const ClassAdCollection &collection) : ClassAdCollect		ClassAdCollection(const ClassAdCollection &) : ClassAdCollectionInterfa
	ionInterface(), viewTree(NULL) { return; }		ce(), viewTree(NULL) { return; }
	ClassAdCollection &operator=(const ClassAdCollection &collection) { ret		ClassAdCollection &operator=(const ClassAdCollection &) { return *this;
	urn *this; }		}
	bool AddClassAd_Transaction(const std::string &key, ClassAd *newAd);		bool AddClassAd_Transaction(const std::string &key, ClassAd *newAd);
	bool AddClassAd_NoTransaction(const std::string &key, ClassAd *newAd);		bool AddClassAd_NoTransaction(const std::string &key, ClassAd *newAd);
	};		};
	END_NAMESPACE		END_NAMESPACE
	#endif		#endif
End of changes. 7 change blocks.
	24 lines changed or deleted		20 lines changed or added

	common.h		common.h
	/*********************************************************************		/***************************************************************
	*		*
	* Condor ClassAd library		* Copyright (C) 1990-2007, Condor Team, Computer Sciences Department,
	* Copyright (C) 1990-2003, Condor Team, Computer Sciences Department,		* University of Wisconsin-Madison, WI.
	* University of Wisconsin-Madison, WI and Rajesh Raman.
	*		*
	* This source code is covered by the Condor Public License, which can		* Licensed under the Apache License, Version 2.0 (the "License"); you
	* be found in the accompanying LICENSE file, or online at		* may not use this file except in compliance with the License. You may
	* www.condorproject.org.		* obtain a copy of the License at
	*		*
	* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS		* http://www.apache.org/licenses/LICENSE-2.0
	* AND THE UNIVERSITY OF WISCONSIN-MADISON "AS IS" AND ANY EXPRESS OR
	* IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
	* WARRANTIES OF MERCHANTABILITY, OF SATISFACTORY QUALITY, AND FITNESS
	* FOR A PARTICULAR PURPOSE OR USE ARE DISCLAIMED. THE COPYRIGHT
	* HOLDERS AND CONTRIBUTORS AND THE UNIVERSITY OF WISCONSIN-MADISON
	* MAKE NO MAKE NO REPRESENTATION THAT THE SOFTWARE, MODIFICATIONS,
	* ENHANCEMENTS OR DERIVATIVE WORKS THEREOF, WILL NOT INFRINGE ANY
	* PATENT, COPYRIGHT, TRADEMARK, TRADE SECRET OR OTHER PROPRIETARY
	* RIGHT.
	*		*
	*********************************************************************/		* Unless required by applicable law or agreed to in writing, software
			* distributed under the License is distributed on an "AS IS" BASIS,
			* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
			* See the License for the specific language governing permissions and
			* limitations under the License.
			*
			***************************************************************/
	#ifndef __COMMON_H__		#ifndef __COMMON_H__
	#define __COMMON_H__		#define __COMMON_H__
	#if defined( WANT_NAMESPACES ) && defined(__cplusplus)		#include <strings.h>
			#if defined( WANT_CLASSAD_NAMESPACE ) && defined(__cplusplus)
	#define BEGIN_NAMESPACE( x ) namespace x {		#define BEGIN_NAMESPACE( x ) namespace x {
	#define END_NAMESPACE }		#define END_NAMESPACE }
	#else		#else
	#define BEGIN_NAMESPACE( x )		#define BEGIN_NAMESPACE( x )
	#define END_NAMESPACE		#define END_NAMESPACE
	#endif		#endif
	#ifdef CLASSAD_DISTRIBUTION		#ifdef CLASSAD_DISTRIBUTION
	#ifndef _GNU_SOURCE		#ifndef _GNU_SOURCE
	#define _GNU_SOURCE /* to get definition for strptime on Linux */		#define _GNU_SOURCE /* to get definition for strptime on Linux */
	#endif		#endif
	#ifndef __EXTENSIONS__		#ifndef __EXTENSIONS__
	#define __EXTENSIONS__ /* to get gmtime_r and localtime_r on Solaris */		#define __EXTENSIONS__ /* to get gmtime_r and localtime_r on Solaris */
	#endif		#endif
	#ifndef _POSIX_C_SOURCE
	#define _POSIX_C_SOURCE 199506L /* To get asctime_r */
	#endif
	#ifdef WIN32		#ifdef WIN32
	// These must be defined before any of the		// These must be defined before any of the
	// other headers are pulled in.		// other headers are pulled in.
	#define _STLP_NEW_PLATFORM_SDK		#define _STLP_NEW_PLATFORM_SDK
	#define _STLP_NO_OWN_IOSTREAMS 1		#define _STLP_NO_OWN_IOSTREAMS 1
	#endif /* WIN32 */		#endif /* WIN32 */
	#include <stdio.h>		#include <stdio.h>
	#include <stdlib.h>		#include <stdlib.h>
	skipping to change at line 106		skipping to change at line 100
	#ifndef _POSIX_C_SOURCE		#ifndef _POSIX_C_SOURCE
	#define _POSIX_C_SOURCE 199506L /* To get asctime_r */		#define _POSIX_C_SOURCE 199506L /* To get asctime_r */
	#endif		#endif
	#include "condor_common.h"		#include "condor_common.h"
	#include "condor_debug.h"		#include "condor_debug.h"
	#include "condor_attributes.h"		#include "condor_attributes.h"
	#endif /* CLASSAD_DISTRIBUTION */		#endif /* CLASSAD_DISTRIBUTION */
	#include "classad_features.h"		#include "classad/debug.h"
	#include "debug.h"
	#ifdef __cplusplus		#ifdef __cplusplus
	#include <string>		#include <string>
	#endif		#endif
	BEGIN_NAMESPACE( classad )		BEGIN_NAMESPACE( classad )
	static const char ATTR_AD [] = "A d";		static const char ATTR_AD [] = "A d";
	static const char ATTR_CONTEXT [] = "Context";		static const char ATTR_CONTEXT [] = "Context";
	static const char ATTR_DEEP_MODS [] = "DeepMods" ;		static const char ATTR_DEEP_MODS [] = "DeepMods" ;
	skipping to change at line 194		skipping to change at line 187
	#endif		#endif
	extern int CondorErrno;		extern int CondorErrno;
	static const std::string NULL_XACTION = "";		static const std::string NULL_XACTION = "";
	END_NAMESPACE // classad		END_NAMESPACE // classad
	char* strnewp( const char* );		char* strnewp( const char* );
	#if defined(CLASSAD_DISTRIBUTION)		#if defined(CLASSAD_DISTRIBUTION)
	#include "classadErrno.h"		#include "classad/classadErrno.h"
	#else		#else
	#include "condor_errno.h"		#include "condor_errno.h"
	#endif		#endif
	#endif//__COMMON_H__		#endif//__COMMON_H__
End of changes. 9 change blocks.
	26 lines changed or deleted		19 lines changed or added

	debug.h		debug.h
	/*********************************************************************		/***************************************************************
	*		*
	* Condor ClassAd library		* Copyright (C) 1990-2007, Condor Team, Computer Sciences Department,
	* Copyright (C) 1990-2003, Condor Team, Computer Sciences Department,		* University of Wisconsin-Madison, WI.
	* University of Wisconsin-Madison, WI and Rajesh Raman.
	*		*
	* This source code is covered by the Condor Public License, which can		* Licensed under the Apache License, Version 2.0 (the "License"); you
	* be found in the accompanying LICENSE file, or online at		* may not use this file except in compliance with the License. You may
	* www.condorproject.org.		* obtain a copy of the License at
	*		*
	* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS		* http://www.apache.org/licenses/LICENSE-2.0
	* AND THE UNIVERSITY OF WISCONSIN-MADISON "AS IS" AND ANY EXPRESS OR
	* IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
	* WARRANTIES OF MERCHANTABILITY, OF SATISFACTORY QUALITY, AND FITNESS
	* FOR A PARTICULAR PURPOSE OR USE ARE DISCLAIMED. THE COPYRIGHT
	* HOLDERS AND CONTRIBUTORS AND THE UNIVERSITY OF WISCONSIN-MADISON
	* MAKE NO MAKE NO REPRESENTATION THAT THE SOFTWARE, MODIFICATIONS,
	* ENHANCEMENTS OR DERIVATIVE WORKS THEREOF, WILL NOT INFRINGE ANY
	* PATENT, COPYRIGHT, TRADEMARK, TRADE SECRET OR OTHER PROPRIETARY
	* RIGHT.
	*		*
	*********************************************************************/		* Unless required by applicable law or agreed to in writing, software
			* distributed under the License is distributed on an "AS IS" BASIS,
			* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
			* See the License for the specific language governing permissions and
			* limitations under the License.
			*
			***************************************************************/
	#ifndef __CLASSAD_DEBUG_H__		#ifndef __CLASSAD_DEBUG_H__
	#define __CLASSAD_DEBUG_H__		#define __CLASSAD_DEBUG_H__
	#include "common.h"		#include "classad/common.h"
	BEGIN_NAMESPACE( classad )		BEGIN_NAMESPACE( classad )
	#define CLASSAD_EXCEPT \		#define CLASSAD_EXCEPT \
	_except_line_number = __LINE__, \		_except_line_number = __LINE__, \
	_except_file_name = __FILE__, \		_except_file_name = __FILE__, \
	_classad_except		_classad_except
	extern int _except_line_number;		extern int _except_line_number;
	extern char *_except_file_name;		extern char *_except_file_name;
End of changes. 6 change blocks.
	19 lines changed or deleted		15 lines changed or added

	exprList.h		exprList.h
	/*********************************************************************		/***************************************************************
	*		*
	* Condor ClassAd library		* Copyright (C) 1990-2007, Condor Team, Computer Sciences Department,
	* Copyright (C) 1990-2003, Condor Team, Computer Sciences Department,		* University of Wisconsin-Madison, WI.
	* University of Wisconsin-Madison, WI and Rajesh Raman.
	*		*
	* This source code is covered by the Condor Public License, which can		* Licensed under the Apache License, Version 2.0 (the "License"); you
	* be found in the accompanying LICENSE file, or online at		* may not use this file except in compliance with the License. You may
	* www.condorproject.org.		* obtain a copy of the License at
	*		*
	* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS		* http://www.apache.org/licenses/LICENSE-2.0
	* AND THE UNIVERSITY OF WISCONSIN-MADISON "AS IS" AND ANY EXPRESS OR
	* IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
	* WARRANTIES OF MERCHANTABILITY, OF SATISFACTORY QUALITY, AND FITNESS
	* FOR A PARTICULAR PURPOSE OR USE ARE DISCLAIMED. THE COPYRIGHT
	* HOLDERS AND CONTRIBUTORS AND THE UNIVERSITY OF WISCONSIN-MADISON
	* MAKE NO MAKE NO REPRESENTATION THAT THE SOFTWARE, MODIFICATIONS,
	* ENHANCEMENTS OR DERIVATIVE WORKS THEREOF, WILL NOT INFRINGE ANY
	* PATENT, COPYRIGHT, TRADEMARK, TRADE SECRET OR OTHER PROPRIETARY
	* RIGHT.
	*		*
	*********************************************************************/		* Unless required by applicable law or agreed to in writing, software
			* distributed under the License is distributed on an "AS IS" BASIS,
			* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
			* See the License for the specific language governing permissions and
			* limitations under the License.
			*
			***************************************************************/
	#ifndef __EXPR_LIST_H__		#ifndef __EXPR_LIST_H__
	#define __EXPR_LIST_H__		#define __EXPR_LIST_H__
	#include <vector>		#include <vector>
	BEGIN_NAMESPACE( classad )		BEGIN_NAMESPACE( classad )
	class ExprListIterator;		class ExprListIterator;
End of changes. 5 change blocks.
	18 lines changed or deleted		14 lines changed or added

	exprTree.h		exprTree.h
	/*********************************************************************		/***************************************************************
	*		*
	* Condor ClassAd library		* Copyright (C) 1990-2007, Condor Team, Computer Sciences Department,
	* Copyright (C) 1990-2003, Condor Team, Computer Sciences Department,		* University of Wisconsin-Madison, WI.
	* University of Wisconsin-Madison, WI and Rajesh Raman.
	*		*
	* This source code is covered by the Condor Public License, which can		* Licensed under the Apache License, Version 2.0 (the "License"); you
	* be found in the accompanying LICENSE file, or online at		* may not use this file except in compliance with the License. You may
	* www.condorproject.org.		* obtain a copy of the License at
	*		*
	* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS		* http://www.apache.org/licenses/LICENSE-2.0
	* AND THE UNIVERSITY OF WISCONSIN-MADISON "AS IS" AND ANY EXPRESS OR
	* IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
	* WARRANTIES OF MERCHANTABILITY, OF SATISFACTORY QUALITY, AND FITNESS
	* FOR A PARTICULAR PURPOSE OR USE ARE DISCLAIMED. THE COPYRIGHT
	* HOLDERS AND CONTRIBUTORS AND THE UNIVERSITY OF WISCONSIN-MADISON
	* MAKE NO MAKE NO REPRESENTATION THAT THE SOFTWARE, MODIFICATIONS,
	* ENHANCEMENTS OR DERIVATIVE WORKS THEREOF, WILL NOT INFRINGE ANY
	* PATENT, COPYRIGHT, TRADEMARK, TRADE SECRET OR OTHER PROPRIETARY
	* RIGHT.
	*		*
	*********************************************************************/		* Unless required by applicable law or agreed to in writing, software
			* distributed under the License is distributed on an "AS IS" BASIS,
			* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
			* See the License for the specific language governing permissions and
			* limitations under the License.
			*
			***************************************************************/
	#ifndef __EXPR_TREE_H__		#ifndef __EXPR_TREE_H__
	#define __EXPR_TREE_H__		#define __EXPR_TREE_H__
	#include "classad_stl.h"		#include "classad/classad_stl.h"
	#include "common.h"		#include "classad/common.h"
	#include "value.h"		#include "classad/value.h"
	BEGIN_NAMESPACE( classad )		BEGIN_NAMESPACE( classad )
	// forward declarations		// forward declarations
	class ExprTree;		class ExprTree;
	class ClassAd;		class ClassAd;
	class MatchClassAd;		class MatchClassAd;
	typedef classad_hash_map< const ExprTree*, Value, ExprHash > EvalCache;		typedef classad_hash_map< const ExprTree*, Value, ExprHash > EvalCache;
	skipping to change at line 192		skipping to change at line 188
	virtual bool _Evaluate( EvalState&, Value&, ExprTree*& ) con st=0;		virtual bool _Evaluate( EvalState&, Value&, ExprTree*& ) con st=0;
	virtual bool _Flatten( EvalState&, Value&, ExprTree*&, int* )const=0;		virtual bool _Flatten( EvalState&, Value&, ExprTree*&, int* )const=0;
	friend bool operator==(const ExprTree &tree1, const ExprTree &tree2 );		friend bool operator==(const ExprTree &tree1, const ExprTree &tree2 );
	};		};
	std::ostream& operator<<(std::ostream &os, const ExprTree &expr);		std::ostream& operator<<(std::ostream &os, const ExprTree &expr);
	END_NAMESPACE // classad		END_NAMESPACE // classad
	#include "literals.h"		#include "classad/literals.h"
	#include "attrrefs.h"		#include "classad/attrrefs.h"
	#include "operators.h"		#include "classad/operators.h"
	#include "exprList.h"		#include "classad/exprList.h"
	#include "classad.h"		#include "classad/classad.h"
	#include "fnCall.h"		#include "classad/fnCall.h"
	#endif//__EXPR_TREE_H__		#endif//__EXPR_TREE_H__
End of changes. 7 change blocks.
	27 lines changed or deleted		23 lines changed or added

	fnCall.h		fnCall.h
	/*********************************************************************		/***************************************************************
	*		*
	* Condor ClassAd library		* Copyright (C) 1990-2007, Condor Team, Computer Sciences Department,
	* Copyright (C) 1990-2003, Condor Team, Computer Sciences Department,		* University of Wisconsin-Madison, WI.
	* University of Wisconsin-Madison, WI and Rajesh Raman.
	*		*
	* This source code is covered by the Condor Public License, which can		* Licensed under the Apache License, Version 2.0 (the "License"); you
	* be found in the accompanying LICENSE file, or online at		* may not use this file except in compliance with the License. You may
	* www.condorproject.org.		* obtain a copy of the License at
	*		*
	* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS		* http://www.apache.org/licenses/LICENSE-2.0
	* AND THE UNIVERSITY OF WISCONSIN-MADISON "AS IS" AND ANY EXPRESS OR
	* IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
	* WARRANTIES OF MERCHANTABILITY, OF SATISFACTORY QUALITY, AND FITNESS
	* FOR A PARTICULAR PURPOSE OR USE ARE DISCLAIMED. THE COPYRIGHT
	* HOLDERS AND CONTRIBUTORS AND THE UNIVERSITY OF WISCONSIN-MADISON
	* MAKE NO MAKE NO REPRESENTATION THAT THE SOFTWARE, MODIFICATIONS,
	* ENHANCEMENTS OR DERIVATIVE WORKS THEREOF, WILL NOT INFRINGE ANY
	* PATENT, COPYRIGHT, TRADEMARK, TRADE SECRET OR OTHER PROPRIETARY
	* RIGHT.
	*		*
	*********************************************************************/		* Unless required by applicable law or agreed to in writing, software
			* distributed under the License is distributed on an "AS IS" BASIS,
			* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
			* See the License for the specific language governing permissions and
			* limitations under the License.
			*
			***************************************************************/
	#ifndef __FN_CALL_H__		#ifndef __FN_CALL_H__
	#define __FN_CALL_H__		#define __FN_CALL_H__
	#include <map>		#include <map>
	#include <vector>		#include <vector>
	#include "classad.h"		#include "classad/classad.h"
	#include "classad_features.h"
	BEGIN_NAMESPACE( classad )		BEGIN_NAMESPACE( classad )
	typedef std::vector<ExprTree*> ArgumentList;		typedef std::vector<ExprTree*> ArgumentList;
	typedef struct		typedef struct
	{		{
	std::string functionName;		std::string functionName;
	// The function should be a ClassAdFunc. Because we use this structu re		// The function should be a ClassAdFunc. Because we use this structu re
	skipping to change at line 52		skipping to change at line 47
	// C interface, we keep it as a void*, unfortunately.		// C interface, we keep it as a void*, unfortunately.
	// The onus is on you to make sure that it's really a ClassAdFunc!		// The onus is on you to make sure that it's really a ClassAdFunc!
	void *function;		void *function;
	// We are likely to add some flags here in the future. These		// We are likely to add some flags here in the future. These
	// flags will describe things like how to cache results of the		// flags will describe things like how to cache results of the
	// function. Currently they are unused, so set it to zero.		// function. Currently they are unused, so set it to zero.
	int flags;		int flags;
	} ClassAdFunctionMapping;		} ClassAdFunctionMapping;
	#ifdef ENABLE_SHARED_LIBRARY_FUNCTIONS
	// If you create a shared library, you have to provide a function		// If you create a shared library, you have to provide a function
	// named "Initialize" that conforms to this prototype. You will return		// named "Initialize" that conforms to this prototype. You will return
	// a table of function mappings. The last mapping in the table should		// a table of function mappings. The last mapping in the table should
	// have a NULL function pointer. It will be ignored.		// have a NULL function pointer. It will be ignored.
	typedef ClassAdFunctionMapping *(*ClassAdSharedLibraryInit)(void);		typedef ClassAdFunctionMapping *(*ClassAdSharedLibraryInit)(void);
	#endif
	/// Node of the expression which represents a call to an function		/// Node of the expression which represents a call to an function
	class FunctionCall : public ExprTree		class FunctionCall : public ExprTree
	{		{
	public:		public:
	typedef bool(*ClassAdFunc)(const char*, const ArgumentList&, EvalSta te&,		typedef bool(*ClassAdFunc)(const char*, const ArgumentList&, EvalSta te&,
	Value&);		Value&);
	/// Copy Constructor		/// Copy Constructor
	FunctionCall(FunctionCall &functioncall);		FunctionCall(FunctionCall &functioncall);
	skipping to change at line 101		skipping to change at line 94
	bool CopyFrom(const FunctionCall &functioncall);		bool CopyFrom(const FunctionCall &functioncall);
	virtual bool SameAs(const ExprTree *tree) const;		virtual bool SameAs(const ExprTree *tree) const;
	friend bool operator==(const FunctionCall &fn1, const FunctionCall &fn2 );		friend bool operator==(const FunctionCall &fn1, const FunctionCall &fn2 );
	static void RegisterFunction(std::string &functionName, ClassAdFunc function);		static void RegisterFunction(std::string &functionName, ClassAdFunc function);
	static void RegisterFunctions(ClassAdFunctionMapping *functions);		static void RegisterFunctions(ClassAdFunctionMapping *functions);
	#ifdef ENABLE_SHARED_LIBRARY_FUNCTIONS
	static bool RegisterSharedLibraryFunctions(const char *shared_librar y_path);		static bool RegisterSharedLibraryFunctions(const char *shared_librar y_path);
	#endif
	protected:		protected:
	/// Constructor		/// Constructor
	FunctionCall ();		FunctionCall ();
	typedef std::map<std::string, void*, CaseIgnLTStr > FuncTable;		typedef std::map<std::string, void*, CaseIgnLTStr > FuncTable;
	private:		private:
	virtual void _SetParentScope( const ClassAd* );		virtual void _SetParentScope( const ClassAd* );
	virtual bool _Evaluate( EvalState &, Value & ) const;		virtual bool _Evaluate( EvalState &, Value & ) const;
	skipping to change at line 184		skipping to change at line 175
	static bool changeCase(const char*,const ArgumentList&,EvalState&,		static bool changeCase(const char*,const ArgumentList&,EvalState&,
	Value&);		Value&);
	static bool subString(const char*,const ArgumentList&,EvalState&,		static bool subString(const char*,const ArgumentList&,EvalState&,
	Value&);		Value&);
	static bool compareString(const char*,const ArgumentList&,EvalState& ,		static bool compareString(const char*,const ArgumentList&,EvalState& ,
	Value&);		Value&);
	// pattern matching		// pattern matching
	static bool matchPattern(const char*,const ArgumentList&,EvalState&,		static bool matchPattern(const char*,const ArgumentList&,EvalState&,
	Value&);		Value&);
			static bool substPattern( const char*,const ArgumentList &argList,Ev
			alState &state, Value &result );
	static bool matchPatternMember(const char*,const ArgumentList &argLi st,EvalState &state,		static bool matchPatternMember(const char*,const ArgumentList &argLi st,EvalState &state,
	Value &result);		Value &result);
	// type conversion		// type conversion
	static bool convInt(const char*,const ArgumentList&,EvalState&,Value &);		static bool convInt(const char*,const ArgumentList&,EvalState&,Value &);
	static bool convReal(const char*,const ArgumentList&,EvalState&,Valu e&);		static bool convReal(const char*,const ArgumentList&,EvalState&,Valu e&);
	static bool convString(const char*,const ArgumentList&,EvalState&,		static bool convString(const char*,const ArgumentList&,EvalState&,
	Value&);		Value&);
	static bool convBool(const char*,const ArgumentList&,EvalState&,Valu e&);		static bool convBool(const char*,const ArgumentList&,EvalState&,Valu e&);
	static bool convTime(const char*,const ArgumentList&,EvalState&,Valu e&);		static bool convTime(const char*,const ArgumentList&,EvalState&,Valu e&);
	// math (floor, ceil, round)		// math (floor, ceil, round)
	static bool doMath(const char*,const ArgumentList&,EvalState&,Value& );		static bool doMath(const char*,const ArgumentList&,EvalState&,Value& );
	static bool random(const char*,const ArgumentList&,EvalState&,Value& );		static bool random(const char*,const ArgumentList&,EvalState&,Value& );
			static bool ifThenElse( const char* name,const ArgumentList &argList
			,EvalState &state,Value &result );
			static bool interval( const char* name,const ArgumentList &argList,E
			valState &state,Value &result );
	//static bool doReal(const char*,const ArgumentList&,EvalState&,Valu e&);		//static bool doReal(const char*,const ArgumentList&,EvalState&,Valu e&);
	};		};
	END_NAMESPACE // classad		END_NAMESPACE // classad
	#endif//__FN_CALL_H__		#endif//__FN_CALL_H__
End of changes. 12 change blocks.
	24 lines changed or deleted		24 lines changed or added

	indexfile.h		indexfile.h
	/*********************************************************************		/***************************************************************
	*		*
	* Condor ClassAd library		* Copyright (C) 1990-2007, Condor Team, Computer Sciences Department,
	* Copyright (C) 1990-2003, Condor Team, Computer Sciences Department,		* University of Wisconsin-Madison, WI.
	* University of Wisconsin-Madison, WI and Rajesh Raman.
	*		*
	* This source code is covered by the Condor Public License, which can		* Licensed under the Apache License, Version 2.0 (the "License"); you
	* be found in the accompanying LICENSE file, or online at		* may not use this file except in compliance with the License. You may
	* www.condorproject.org.		* obtain a copy of the License at
	*		*
	* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS		* http://www.apache.org/licenses/LICENSE-2.0
	* AND THE UNIVERSITY OF WISCONSIN-MADISON "AS IS" AND ANY EXPRESS OR
	* IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
	* WARRANTIES OF MERCHANTABILITY, OF SATISFACTORY QUALITY, AND FITNESS
	* FOR A PARTICULAR PURPOSE OR USE ARE DISCLAIMED. THE COPYRIGHT
	* HOLDERS AND CONTRIBUTORS AND THE UNIVERSITY OF WISCONSIN-MADISON
	* MAKE NO MAKE NO REPRESENTATION THAT THE SOFTWARE, MODIFICATIONS,
	* ENHANCEMENTS OR DERIVATIVE WORKS THEREOF, WILL NOT INFRINGE ANY
	* PATENT, COPYRIGHT, TRADEMARK, TRADE SECRET OR OTHER PROPRIETARY
	* RIGHT.
	*		*
	*********************************************************************/		* Unless required by applicable law or agreed to in writing, software
			* distributed under the License is distributed on an "AS IS" BASIS,
			* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
			* See the License for the specific language governing permissions and
			* limitations under the License.
			*
			***************************************************************/
	#include <fcntl.h>		#include <fcntl.h>
	#include <stdio.h>		#include <stdio.h>
	#include <string>		#include <string>
	#include <map>		#include <map>
	#include "classad_stl.h"		#include "classad/classad_stl.h"
	#include <sys/types.h>		#include <sys/types.h>
	BEGIN_NAMESPACE( classad )		BEGIN_NAMESPACE( classad )
	typedef struct{		typedef struct{
	int offset;		int offset;
	} tag;		} tag;
	struct eqstr		struct eqstr
	{		{
End of changes. 6 change blocks.
	19 lines changed or deleted		15 lines changed or added

	lexer.h		lexer.h
	/*********************************************************************		/***************************************************************
	*		*
	* Condor ClassAd library		* Copyright (C) 1990-2007, Condor Team, Computer Sciences Department,
	* Copyright (C) 1990-2003, Condor Team, Computer Sciences Department,		* University of Wisconsin-Madison, WI.
	* University of Wisconsin-Madison, WI and Rajesh Raman.
	*		*
	* This source code is covered by the Condor Public License, which can		* Licensed under the Apache License, Version 2.0 (the "License"); you
	* be found in the accompanying LICENSE file, or online at		* may not use this file except in compliance with the License. You may
	* www.condorproject.org.		* obtain a copy of the License at
	*		*
	* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS		* http://www.apache.org/licenses/LICENSE-2.0
	* AND THE UNIVERSITY OF WISCONSIN-MADISON "AS IS" AND ANY EXPRESS OR
	* IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
	* WARRANTIES OF MERCHANTABILITY, OF SATISFACTORY QUALITY, AND FITNESS
	* FOR A PARTICULAR PURPOSE OR USE ARE DISCLAIMED. THE COPYRIGHT
	* HOLDERS AND CONTRIBUTORS AND THE UNIVERSITY OF WISCONSIN-MADISON
	* MAKE NO MAKE NO REPRESENTATION THAT THE SOFTWARE, MODIFICATIONS,
	* ENHANCEMENTS OR DERIVATIVE WORKS THEREOF, WILL NOT INFRINGE ANY
	* PATENT, COPYRIGHT, TRADEMARK, TRADE SECRET OR OTHER PROPRIETARY
	* RIGHT.
	*		*
	*********************************************************************/		* Unless required by applicable law or agreed to in writing, software
			* distributed under the License is distributed on an "AS IS" BASIS,
			* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
			* See the License for the specific language governing permissions and
			* limitations under the License.
			*
			***************************************************************/
	#ifndef __LEXER_H__		#ifndef __LEXER_H__
	#define __LEXER_H__		#define __LEXER_H__
	#include "common.h"		#include "classad/common.h"
	#include "value.h"		#include "classad/value.h"
	#include "lexerSource.h"		#include "classad/lexerSource.h"
	BEGIN_NAMESPACE( classad )		BEGIN_NAMESPACE( classad )
	// the lexical analyzer class		// the lexical analyzer class
	class Lexer		class Lexer
	{		{
	public:		public:
	enum TokenType		enum TokenType
	{		{
	LEX_TOKEN_ERROR,		LEX_TOKEN_ERROR,
	skipping to change at line 223		skipping to change at line 219
	private:		private:
	// grant access to FunctionCall --- for tokenize{Abs ,Rel}Time fns		// grant access to FunctionCall --- for tokenize{Abs ,Rel}Time fns
	friend class FunctionCall;		friend class FunctionCall;
	friend class ClassAdXMLParser;		friend class ClassAdXMLParser;
	// The copy constructor and assignment operator are defined		// The copy constructor and assignment operator are defined
	// to be private so we don't have to write them, or worry about		// to be private so we don't have to write them, or worry about
	// them being inappropriately used. The day we want them, we can		// them being inappropriately used. The day we want them, we can
	// write them.		// write them.
	Lexer(const Lexer &lexer) { return; }		Lexer(const Lexer &) { return; }
	Lexer &operator=(const Lexer &lexer) { return *this; }		Lexer &operator=(const Lexer &) { return *this; }
	// internal state of lexical analyzer		// internal state of lexical analyzer
	bool initialized;		bool initialized;
	TokenType tokenType; // the integ er id of the token		TokenType tokenType; // the integ er id of the token
	LexerSource *lexSource;		LexerSource *lexSource;
	int markedPos; // index of marked character		int markedPos; // index of marked character
	char savedChar; // stores ch aracter when cut		char savedChar; // stores ch aracter when cut
	int ch; // the curre nt character		int ch; // the curre nt character
	int lexBufferCount; // current offset in lexBuffer		int lexBufferCount; // current offset in lexBuffer
	bool inString; // lexing a string constant		bool inString; // lexing a string constant
End of changes. 7 change blocks.
	23 lines changed or deleted		19 lines changed or added

	lexerSource.h		lexerSource.h
	/*********************************************************************		/***************************************************************
	*		*
	* Condor ClassAd library		* Copyright (C) 1990-2007, Condor Team, Computer Sciences Department,
	* Copyright (C) 1990-2003, Condor Team, Computer Sciences Department,		* University of Wisconsin-Madison, WI.
	* University of Wisconsin-Madison, WI and Rajesh Raman.
	*		*
	* This source code is covered by the Condor Public License, which can		* Licensed under the Apache License, Version 2.0 (the "License"); you
	* be found in the accompanying LICENSE file, or online at		* may not use this file except in compliance with the License. You may
	* www.condorproject.org.		* obtain a copy of the License at
	*		*
	* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS		* http://www.apache.org/licenses/LICENSE-2.0
	* AND THE UNIVERSITY OF WISCONSIN-MADISON "AS IS" AND ANY EXPRESS OR
	* IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
	* WARRANTIES OF MERCHANTABILITY, OF SATISFACTORY QUALITY, AND FITNESS
	* FOR A PARTICULAR PURPOSE OR USE ARE DISCLAIMED. THE COPYRIGHT
	* HOLDERS AND CONTRIBUTORS AND THE UNIVERSITY OF WISCONSIN-MADISON
	* MAKE NO MAKE NO REPRESENTATION THAT THE SOFTWARE, MODIFICATIONS,
	* ENHANCEMENTS OR DERIVATIVE WORKS THEREOF, WILL NOT INFRINGE ANY
	* PATENT, COPYRIGHT, TRADEMARK, TRADE SECRET OR OTHER PROPRIETARY
	* RIGHT.
	*		*
	*********************************************************************/		* Unless required by applicable law or agreed to in writing, software
			* distributed under the License is distributed on an "AS IS" BASIS,
			* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
			* See the License for the specific language governing permissions and
			* limitations under the License.
			*
			***************************************************************/
	#ifndef __LEXER_SOURCE_H__		#ifndef __LEXER_SOURCE_H__
	#define __LEXER_SOURCE_H__		#define __LEXER_SOURCE_H__
	#include "common.h"		#include "classad/common.h"
	#include <iosfwd>		#include <iosfwd>
			BEGIN_NAMESPACE(classad)
	/*		/*
	* LexerSource is a class that provides an abstract interface to the		* LexerSource is a class that provides an abstract interface to the
	* lexer. The lexer reads tokens and gives them to the parser. The		* lexer. The lexer reads tokens and gives them to the parser. The
	* lexer reads single characters from a LexerSource. Because we want		* lexer reads single characters from a LexerSource. Because we want
	* to read characters from different types of sources (files, strings,		* to read characters from different types of sources (files, strings,
	* etc.) without burdening the lexer, the lexer uses this LexerSource		* etc.) without burdening the lexer, the lexer uses this LexerSource
	* abstract class. There are several implementations of the		* abstract class. There are several implementations of the
	* LexerSource that provide access to specific types of sources.		* LexerSource that provide access to specific types of sources.
	*		*
	*/		*/
	skipping to change at line 74		skipping to change at line 72
	// ever put back a single character.		// ever put back a single character.
	virtual void UnreadCharacter(void) = 0;		virtual void UnreadCharacter(void) = 0;
	virtual bool AtEnd(void) const = 0;		virtual bool AtEnd(void) const = 0;
	protected:		protected:
	int _previous_character;		int _previous_character;
	private:		private:
	// The copy constructor and assignment operator are defined		// The copy constructor and assignment operator are defined
	// to be private so we don't have to write them, or worry about		// to be private so we don't have to write them, or worry about
	// them being inappropriately used. The day we want them, we can		// them being inappropriately used. The day we want them, we can
	// write them.		// write them.
	LexerSource(const LexerSource &source) { return; }		LexerSource(const LexerSource &) { return; }
	LexerSource &operator=(const LexerSource &source) { return *this; }		LexerSource &operator=(const LexerSource &) { return *this; }
	};		};
	// This source allows input from a traditional C FILE *		// This source allows input from a traditional C FILE *
	class FileLexerSource : public LexerSource		class FileLexerSource : public LexerSource
	{		{
	public:		public:
	FileLexerSource(FILE *file);		FileLexerSource(FILE *file);
	virtual ~FileLexerSource();		virtual ~FileLexerSource();
	virtual void SetNewSource(FILE *file);		virtual void SetNewSource(FILE *file);
	virtual int ReadCharacter(void);		virtual int ReadCharacter(void);
	virtual void UnreadCharacter(void);		virtual void UnreadCharacter(void);
	virtual bool AtEnd(void) const;		virtual bool AtEnd(void) const;
	private:		private:
	FILE *_file;		FILE *_file;
	FileLexerSource(const FileLexerSource &source) : LexerSource() { return		FileLexerSource(const FileLexerSource &) : LexerSource() { return; }
	; }		FileLexerSource &operator=(const FileLexerSource &) { return *this; }
	FileLexerSource &operator=(const FileLexerSource &source) { return *thi
	s; }
	};		};
	// This source allows input from a C++ stream. Note that		// This source allows input from a C++ stream. Note that
	// the user passes in a pointer to the stream.		// the user passes in a pointer to the stream.
	class InputStreamLexerSource : public LexerSource		class InputStreamLexerSource : public LexerSource
	{		{
	public:		public:
	InputStreamLexerSource(std::istream &stream);		InputStreamLexerSource(std::istream &stream);
	virtual ~InputStreamLexerSource();		virtual ~InputStreamLexerSource();
	virtual void SetNewSource(std::istream &stream);		virtual void SetNewSource(std::istream &stream);
	virtual int ReadCharacter(void);		virtual int ReadCharacter(void);
	virtual void UnreadCharacter(void);		virtual void UnreadCharacter(void);
	virtual bool AtEnd(void) const;		virtual bool AtEnd(void) const;
	private:		private:
	std::istream *_stream;		std::istream *_stream;
	InputStreamLexerSource(const InputStreamLexerSource &source) : LexerSou		InputStreamLexerSource(const InputStreamLexerSource &) : LexerSource()
	rce() { return; }		{ return; }
	InputStreamLexerSource &operator=(const InputStreamLexerSource &source)		InputStreamLexerSource &operator=(const InputStreamLexerSource &) { ret
	{ return *this; }		urn *this; }
	};		};
	// This source allows input from a traditional C string.		// This source allows input from a traditional C string.
	class CharLexerSource : public LexerSource		class CharLexerSource : public LexerSource
	{		{
	public:		public:
	CharLexerSource(const char *string, int offset=0);		CharLexerSource(const char *string, int offset=0);
	virtual ~CharLexerSource();		virtual ~CharLexerSource();
	virtual void SetNewSource(const char *string, int offset=0);		virtual void SetNewSource(const char *string, int offset=0);
	virtual int ReadCharacter(void);		virtual int ReadCharacter(void);
	virtual void UnreadCharacter(void);		virtual void UnreadCharacter(void);
	virtual bool AtEnd(void) const;		virtual bool AtEnd(void) const;
	virtual int GetCurrentLocation(void) const;		virtual int GetCurrentLocation(void) const;
	private:		private:
	const char *_string;		const char *_string;
	int _offset;		int _offset;
	CharLexerSource(const CharLexerSource &source) : LexerSource() { return		CharLexerSource(const CharLexerSource &) : LexerSource() { return;
	; }		}
	CharLexerSource &operator=(const CharLexerSource &source) { return *thi		CharLexerSource &operator=(const CharLexerSource &) { return *this; }
	s; }
	};		};
	// This source allows input from a C++ string.		// This source allows input from a C++ string.
	class StringLexerSource : public LexerSource		class StringLexerSource : public LexerSource
	{		{
	public:		public:
	StringLexerSource(const std::string *string, int offset=0);		StringLexerSource(const std::string *string, int offset=0);
	virtual ~StringLexerSource();		virtual ~StringLexerSource();
	virtual void SetNewSource(const std::string *string, int offset=0);		virtual void SetNewSource(const std::string *string, int offset=0);
	virtual int ReadCharacter(void);		virtual int ReadCharacter(void);
	virtual void UnreadCharacter(void);		virtual void UnreadCharacter(void);
	virtual bool AtEnd(void) const;		virtual bool AtEnd(void) const;
	virtual int GetCurrentLocation(void) const;		virtual int GetCurrentLocation(void) const;
	private:		private:
	const std::string *_string;		const std::string *_string;
	int _offset;		int _offset;
	StringLexerSource(const StringLexerSource &source) : LexerSource() { re		StringLexerSource(const StringLexerSource &) : LexerSource() { return;
	turn; }		}
	StringLexerSource &operator=(const StringLexerSource &source) { return		StringLexerSource &operator=(const StringLexerSource &) { return *this;
	*this; }		}
	};		};
			END_NAMESPACE
	#endif /* __LEXER_SOURCE_H__ */		#endif /* __LEXER_SOURCE_H__ */
End of changes. 13 change blocks.
	37 lines changed or deleted		34 lines changed or added

	literals.h		literals.h
	/*********************************************************************		/***************************************************************
	*		*
	* Condor ClassAd library		* Copyright (C) 1990-2007, Condor Team, Computer Sciences Department,
	* Copyright (C) 1990-2003, Condor Team, Computer Sciences Department,		* University of Wisconsin-Madison, WI.
	* University of Wisconsin-Madison, WI and Rajesh Raman.
	*		*
	* This source code is covered by the Condor Public License, which can		* Licensed under the Apache License, Version 2.0 (the "License"); you
	* be found in the accompanying LICENSE file, or online at		* may not use this file except in compliance with the License. You may
	* www.condorproject.org.		* obtain a copy of the License at
	*		*
	* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS		* http://www.apache.org/licenses/LICENSE-2.0
	* AND THE UNIVERSITY OF WISCONSIN-MADISON "AS IS" AND ANY EXPRESS OR
	* IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
	* WARRANTIES OF MERCHANTABILITY, OF SATISFACTORY QUALITY, AND FITNESS
	* FOR A PARTICULAR PURPOSE OR USE ARE DISCLAIMED. THE COPYRIGHT
	* HOLDERS AND CONTRIBUTORS AND THE UNIVERSITY OF WISCONSIN-MADISON
	* MAKE NO MAKE NO REPRESENTATION THAT THE SOFTWARE, MODIFICATIONS,
	* ENHANCEMENTS OR DERIVATIVE WORKS THEREOF, WILL NOT INFRINGE ANY
	* PATENT, COPYRIGHT, TRADEMARK, TRADE SECRET OR OTHER PROPRIETARY
	* RIGHT.
	*		*
	*********************************************************************/		* Unless required by applicable law or agreed to in writing, software
			* distributed under the License is distributed on an "AS IS" BASIS,
			* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
			* See the License for the specific language governing permissions and
			* limitations under the License.
			*
			***************************************************************/
	#ifndef __LITERALS_H__		#ifndef __LITERALS_H__
	#define __LITERALS_H__		#define __LITERALS_H__
	BEGIN_NAMESPACE( classad )		BEGIN_NAMESPACE( classad )
	typedef std::vector<ExprTree*> ArgumentList;		typedef std::vector<ExprTree*> ArgumentList;
	/** Represents the literals of the ClassAd language, such as integers,		/** Represents the literals of the ClassAd language, such as integers,
	reals, booleans, strings, undefined and real.		reals, booleans, strings, undefined and real.
End of changes. 5 change blocks.
	18 lines changed or deleted		14 lines changed or added

	matchClassad.h		matchClassad.h
	/*********************************************************************		/***************************************************************
	*		*
	* Condor ClassAd library		* Copyright (C) 1990-2007, Condor Team, Computer Sciences Department,
	* Copyright (C) 1990-2003, Condor Team, Computer Sciences Department,		* University of Wisconsin-Madison, WI.
	* University of Wisconsin-Madison, WI and Rajesh Raman.
	*		*
	* This source code is covered by the Condor Public License, which can		* Licensed under the Apache License, Version 2.0 (the "License"); you
	* be found in the accompanying LICENSE file, or online at		* may not use this file except in compliance with the License. You may
	* www.condorproject.org.		* obtain a copy of the License at
	*		*
	* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS		* http://www.apache.org/licenses/LICENSE-2.0
	* AND THE UNIVERSITY OF WISCONSIN-MADISON "AS IS" AND ANY EXPRESS OR
	* IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
	* WARRANTIES OF MERCHANTABILITY, OF SATISFACTORY QUALITY, AND FITNESS
	* FOR A PARTICULAR PURPOSE OR USE ARE DISCLAIMED. THE COPYRIGHT
	* HOLDERS AND CONTRIBUTORS AND THE UNIVERSITY OF WISCONSIN-MADISON
	* MAKE NO MAKE NO REPRESENTATION THAT THE SOFTWARE, MODIFICATIONS,
	* ENHANCEMENTS OR DERIVATIVE WORKS THEREOF, WILL NOT INFRINGE ANY
	* PATENT, COPYRIGHT, TRADEMARK, TRADE SECRET OR OTHER PROPRIETARY
	* RIGHT.
	*		*
	*********************************************************************/		* Unless required by applicable law or agreed to in writing, software
			* distributed under the License is distributed on an "AS IS" BASIS,
			* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
			* See the License for the specific language governing permissions and
			* limitations under the License.
			*
			***************************************************************/
	#ifndef __MATCH_CLASSAD_H__		#ifndef __MATCH_CLASSAD_H__
	#define __MATCH_CLASSAD_H__		#define __MATCH_CLASSAD_H__
	#include "classad.h"		#include "classad/classad.h"
	BEGIN_NAMESPACE( classad )		BEGIN_NAMESPACE( classad )
	/** Special case of a ClassAd which make it easy to do matching.		/** Special case of a ClassAd which make it easy to do matching.
	The top-level ClassAd is defined as follows:		The top-level ClassAd is defined as follows:
	<pre>		<pre>
	[		[
	symmetricMatch = leftMatchesRight && rightMatchesLeft;		symmetricMatch = leftMatchesRight && rightMatchesLeft;
	leftMatchesRight = adcr.ad.requirements;		leftMatchesRight = adcr.ad.requirements;
	rightMatchesLeft = adcl.ad.requirements;		rightMatchesLeft = adcl.ad.requirements;
	skipping to change at line 153		skipping to change at line 149
	protected:		protected:
	const ClassAd *ladParent, *radParent;		const ClassAd *ladParent, *radParent;
	ClassAd *lCtx, *rCtx, *lad, *rad;		ClassAd *lCtx, *rCtx, *lad, *rad;
	private:		private:
	// The copy constructor and assignment operator are defined		// The copy constructor and assignment operator are defined
	// to be private so we don't have to write them, or worry about		// to be private so we don't have to write them, or worry about
	// them being inappropriately used. The day we want them, we can		// them being inappropriately used. The day we want them, we can
	// write them.		// write them.
	MatchClassAd(const MatchClassAd &match) : ClassAd(){ return;		MatchClassAd(const MatchClassAd &) : ClassAd(){ return; }
	}		MatchClassAd &operator=(const MatchClassAd &) { return *this; }
	MatchClassAd &operator=(const MatchClassAd &match) { return *this;
	}
	};		};
	END_NAMESPACE // classad		END_NAMESPACE // classad
	#endif		#endif
End of changes. 7 change blocks.
	23 lines changed or deleted		17 lines changed or added

	operators.h		operators.h
	/*********************************************************************		/***************************************************************
	*		*
	* Condor ClassAd library		* Copyright (C) 1990-2007, Condor Team, Computer Sciences Department,
	* Copyright (C) 1990-2003, Condor Team, Computer Sciences Department,		* University of Wisconsin-Madison, WI.
	* University of Wisconsin-Madison, WI and Rajesh Raman.
	*		*
	* This source code is covered by the Condor Public License, which can		* Licensed under the Apache License, Version 2.0 (the "License"); you
	* be found in the accompanying LICENSE file, or online at		* may not use this file except in compliance with the License. You may
	* www.condorproject.org.		* obtain a copy of the License at
	*		*
	* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS		* http://www.apache.org/licenses/LICENSE-2.0
	* AND THE UNIVERSITY OF WISCONSIN-MADISON "AS IS" AND ANY EXPRESS OR
	* IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
	* WARRANTIES OF MERCHANTABILITY, OF SATISFACTORY QUALITY, AND FITNESS
	* FOR A PARTICULAR PURPOSE OR USE ARE DISCLAIMED. THE COPYRIGHT
	* HOLDERS AND CONTRIBUTORS AND THE UNIVERSITY OF WISCONSIN-MADISON
	* MAKE NO MAKE NO REPRESENTATION THAT THE SOFTWARE, MODIFICATIONS,
	* ENHANCEMENTS OR DERIVATIVE WORKS THEREOF, WILL NOT INFRINGE ANY
	* PATENT, COPYRIGHT, TRADEMARK, TRADE SECRET OR OTHER PROPRIETARY
	* RIGHT.
	*		*
	*********************************************************************/		* Unless required by applicable law or agreed to in writing, software
			* distributed under the License is distributed on an "AS IS" BASIS,
			* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
			* See the License for the specific language governing permissions and
			* limitations under the License.
			*
			***************************************************************/
	#ifndef __OPERATORS_H__		#ifndef __OPERATORS_H__
	#define __OPERATORS_H__		#define __OPERATORS_H__
	#include "exprTree.h"		#include "classad/exprTree.h"
	BEGIN_NAMESPACE( classad )		BEGIN_NAMESPACE( classad )
	/** Represents a node of the expression tree which is an operation applied to		/** Represents a node of the expression tree which is an operation applied to
	expression operands, like 3 + 2		expression operands, like 3 + 2
	*/		*/
	class Operation : public ExprTree		class Operation : public ExprTree
	{		{
	public:		public:
	/// List of supported operators		/// List of supported operators
End of changes. 6 change blocks.
	19 lines changed or deleted		15 lines changed or added

	query.h		query.h
	/*********************************************************************		/***************************************************************
	*		*
	* Condor ClassAd library		* Copyright (C) 1990-2007, Condor Team, Computer Sciences Department,
	* Copyright (C) 1990-2003, Condor Team, Computer Sciences Department,		* University of Wisconsin-Madison, WI.
	* University of Wisconsin-Madison, WI and Rajesh Raman.
	*		*
	* This source code is covered by the Condor Public License, which can		* Licensed under the Apache License, Version 2.0 (the "License"); you
	* be found in the accompanying LICENSE file, or online at		* may not use this file except in compliance with the License. You may
	* www.condorproject.org.		* obtain a copy of the License at
	*		*
	* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS		* http://www.apache.org/licenses/LICENSE-2.0
	* AND THE UNIVERSITY OF WISCONSIN-MADISON "AS IS" AND ANY EXPRESS OR
	* IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
	* WARRANTIES OF MERCHANTABILITY, OF SATISFACTORY QUALITY, AND FITNESS
	* FOR A PARTICULAR PURPOSE OR USE ARE DISCLAIMED. THE COPYRIGHT
	* HOLDERS AND CONTRIBUTORS AND THE UNIVERSITY OF WISCONSIN-MADISON
	* MAKE NO MAKE NO REPRESENTATION THAT THE SOFTWARE, MODIFICATIONS,
	* ENHANCEMENTS OR DERIVATIVE WORKS THEREOF, WILL NOT INFRINGE ANY
	* PATENT, COPYRIGHT, TRADEMARK, TRADE SECRET OR OTHER PROPRIETARY
	* RIGHT.
	*		*
	*********************************************************************/		* Unless required by applicable law or agreed to in writing, software
			* distributed under the License is distributed on an "AS IS" BASIS,
			* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
			* See the License for the specific language governing permissions and
			* limitations under the License.
			*
			***************************************************************/
	#ifndef __QUERY_H__		#ifndef __QUERY_H__
	#define __QUERY_H__		#define __QUERY_H__
	#include <vector>		#include <vector>
	#include <list>		#include <list>
	#include <string>		#include <string>
	BEGIN_NAMESPACE( classad )		BEGIN_NAMESPACE( classad )
End of changes. 5 change blocks.
	18 lines changed or deleted		14 lines changed or added

	sink.h		sink.h
	/*********************************************************************		/***************************************************************
	*		*
	* Condor ClassAd library		* Copyright (C) 1990-2007, Condor Team, Computer Sciences Department,
	* Copyright (C) 1990-2003, Condor Team, Computer Sciences Department,		* University of Wisconsin-Madison, WI.
	* University of Wisconsin-Madison, WI and Rajesh Raman.
	*		*
	* This source code is covered by the Condor Public License, which can		* Licensed under the Apache License, Version 2.0 (the "License"); you
	* be found in the accompanying LICENSE file, or online at		* may not use this file except in compliance with the License. You may
	* www.condorproject.org.		* obtain a copy of the License at
	*		*
	* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS		* http://www.apache.org/licenses/LICENSE-2.0
	* AND THE UNIVERSITY OF WISCONSIN-MADISON "AS IS" AND ANY EXPRESS OR
	* IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
	* WARRANTIES OF MERCHANTABILITY, OF SATISFACTORY QUALITY, AND FITNESS
	* FOR A PARTICULAR PURPOSE OR USE ARE DISCLAIMED. THE COPYRIGHT
	* HOLDERS AND CONTRIBUTORS AND THE UNIVERSITY OF WISCONSIN-MADISON
	* MAKE NO MAKE NO REPRESENTATION THAT THE SOFTWARE, MODIFICATIONS,
	* ENHANCEMENTS OR DERIVATIVE WORKS THEREOF, WILL NOT INFRINGE ANY
	* PATENT, COPYRIGHT, TRADEMARK, TRADE SECRET OR OTHER PROPRIETARY
	* RIGHT.
	*		*
	*********************************************************************/		* Unless required by applicable law or agreed to in writing, software
			* distributed under the License is distributed on an "AS IS" BASIS,
			* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
			* See the License for the specific language governing permissions and
			* limitations under the License.
			*
			***************************************************************/
	#ifndef __SINK_H__		#ifndef __SINK_H__
	#define __SINK_H__		#define __SINK_H__
	#include "common.h"		#include "classad/common.h"
	#include "exprTree.h"		#include "classad/exprTree.h"
	#include <vector>		#include <vector>
	#include <utility> // for pair template		#include <utility> // for pair template
	#include <string>		#include <string>
	BEGIN_NAMESPACE( classad )		BEGIN_NAMESPACE( classad )
	/// This converts a ClassAd into a string representing the %ClassAd		/// This converts a ClassAd into a string representing the %ClassAd
	class ClassAdUnParser		class ClassAdUnParser
	{		{
	public:		public:
End of changes. 6 change blocks.
	20 lines changed or deleted		16 lines changed or added

	source.h		source.h
	/*********************************************************************		/***************************************************************
	*		*
	* Condor ClassAd library		* Copyright (C) 1990-2007, Condor Team, Computer Sciences Department,
	* Copyright (C) 1990-2003, Condor Team, Computer Sciences Department,		* University of Wisconsin-Madison, WI.
	* University of Wisconsin-Madison, WI and Rajesh Raman.
	*		*
	* This source code is covered by the Condor Public License, which can		* Licensed under the Apache License, Version 2.0 (the "License"); you
	* be found in the accompanying LICENSE file, or online at		* may not use this file except in compliance with the License. You may
	* www.condorproject.org.		* obtain a copy of the License at
	*		*
	* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS		* http://www.apache.org/licenses/LICENSE-2.0
	* AND THE UNIVERSITY OF WISCONSIN-MADISON "AS IS" AND ANY EXPRESS OR
	* IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
	* WARRANTIES OF MERCHANTABILITY, OF SATISFACTORY QUALITY, AND FITNESS
	* FOR A PARTICULAR PURPOSE OR USE ARE DISCLAIMED. THE COPYRIGHT
	* HOLDERS AND CONTRIBUTORS AND THE UNIVERSITY OF WISCONSIN-MADISON
	* MAKE NO MAKE NO REPRESENTATION THAT THE SOFTWARE, MODIFICATIONS,
	* ENHANCEMENTS OR DERIVATIVE WORKS THEREOF, WILL NOT INFRINGE ANY
	* PATENT, COPYRIGHT, TRADEMARK, TRADE SECRET OR OTHER PROPRIETARY
	* RIGHT.
	*		*
	*********************************************************************/		* Unless required by applicable law or agreed to in writing, software
			* distributed under the License is distributed on an "AS IS" BASIS,
			* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
			* See the License for the specific language governing permissions and
			* limitations under the License.
			*
			***************************************************************/
	#ifndef __SOURCE_H__		#ifndef __SOURCE_H__
	#define __SOURCE_H__		#define __SOURCE_H__
	#include <vector>		#include <vector>
	#include <iosfwd>		#include <iosfwd>
	#include "lexer.h"		#include "classad/lexer.h"
	BEGIN_NAMESPACE( classad )		BEGIN_NAMESPACE( classad )
	class ClassAd;		class ClassAd;
	class ExprTree;		class ExprTree;
	class ExprList;		class ExprList;
	class FunctionCall;		class FunctionCall;
	/// This reads %ClassAd strings from various sources and converts them into a ClassAd.		/// This reads %ClassAd strings from various sources and converts them into a ClassAd.
	/// It can read from C++ strings, C strings, FILEs, and streams.		/// It can read from C++ strings, C strings, FILEs, and streams.
End of changes. 6 change blocks.
	19 lines changed or deleted		15 lines changed or added

	transaction.h		transaction.h
	/*********************************************************************		/***************************************************************
	*		*
	* Condor ClassAd library		* Copyright (C) 1990-2007, Condor Team, Computer Sciences Department,
	* Copyright (C) 1990-2003, Condor Team, Computer Sciences Department,		* University of Wisconsin-Madison, WI.
	* University of Wisconsin-Madison, WI and Rajesh Raman.
	*		*
	* This source code is covered by the Condor Public License, which can		* Licensed under the Apache License, Version 2.0 (the "License"); you
	* be found in the accompanying LICENSE file, or online at		* may not use this file except in compliance with the License. You may
	* www.condorproject.org.		* obtain a copy of the License at
	*		*
	* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS		* http://www.apache.org/licenses/LICENSE-2.0
	* AND THE UNIVERSITY OF WISCONSIN-MADISON "AS IS" AND ANY EXPRESS OR
	* IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
	* WARRANTIES OF MERCHANTABILITY, OF SATISFACTORY QUALITY, AND FITNESS
	* FOR A PARTICULAR PURPOSE OR USE ARE DISCLAIMED. THE COPYRIGHT
	* HOLDERS AND CONTRIBUTORS AND THE UNIVERSITY OF WISCONSIN-MADISON
	* MAKE NO MAKE NO REPRESENTATION THAT THE SOFTWARE, MODIFICATIONS,
	* ENHANCEMENTS OR DERIVATIVE WORKS THEREOF, WILL NOT INFRINGE ANY
	* PATENT, COPYRIGHT, TRADEMARK, TRADE SECRET OR OTHER PROPRIETARY
	* RIGHT.
	*		*
	*********************************************************************/		* Unless required by applicable law or agreed to in writing, software
			* distributed under the License is distributed on an "AS IS" BASIS,
			* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
			* See the License for the specific language governing permissions and
			* limitations under the License.
			*
			***************************************************************/
	#ifndef __XACTION_H__		#ifndef __XACTION_H__
	#define __XACTION_H__		#define __XACTION_H__
	#include <list>		#include <list>
	#include <string>		#include <string>
	#include "sink.h"		#include "classad/sink.h"
	#include "view.h"		#include "classad/view.h"
	BEGIN_NAMESPACE( classad )		BEGIN_NAMESPACE( classad )
	class ClassAd;		class ClassAd;
	class ClassAdCollection;		class ClassAdCollection;
	class XactionRecord {		class XactionRecord {
	public:		public:
	XactionRecord( ) { op = -1; key = ""; rec = 0; }		XactionRecord( ) { op = -1; key = ""; rec = 0; }
	bool operator==( const XactionRecord &xrec ) const { return false; }		bool operator==( const XactionRecord & ) const { return false; }
	bool operator< ( const XactionRecord &xrec ) const { return false; }		bool operator< ( const XactionRecord & ) const { return false; }
	int op;		int op;
	std::string key;		std::string key;
	ClassAd *rec;		ClassAd *rec;
	ClassAd *backup;		ClassAd *backup;
	};		};
	typedef std::list<XactionRecord> CollectionOpList;		typedef std::list<XactionRecord> CollectionOpList;
	class ServerTransaction {		class ServerTransaction {
End of changes. 7 change blocks.
	22 lines changed or deleted		18 lines changed or added

	util.h		util.h
	/*********************************************************************		/***************************************************************
	*		*
	* Condor ClassAd library		* Copyright (C) 1990-2007, Condor Team, Computer Sciences Department,
	* Copyright (C) 1990-2003, Condor Team, Computer Sciences Department,		* University of Wisconsin-Madison, WI.
	* University of Wisconsin-Madison, WI and Rajesh Raman.
	*		*
	* This source code is covered by the Condor Public License, which can		* Licensed under the Apache License, Version 2.0 (the "License"); you
	* be found in the accompanying LICENSE file, or online at		* may not use this file except in compliance with the License. You may
	* www.condorproject.org.		* obtain a copy of the License at
	*		*
	* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS		* http://www.apache.org/licenses/LICENSE-2.0
	* AND THE UNIVERSITY OF WISCONSIN-MADISON "AS IS" AND ANY EXPRESS OR
	* IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
	* WARRANTIES OF MERCHANTABILITY, OF SATISFACTORY QUALITY, AND FITNESS
	* FOR A PARTICULAR PURPOSE OR USE ARE DISCLAIMED. THE COPYRIGHT
	* HOLDERS AND CONTRIBUTORS AND THE UNIVERSITY OF WISCONSIN-MADISON
	* MAKE NO MAKE NO REPRESENTATION THAT THE SOFTWARE, MODIFICATIONS,
	* ENHANCEMENTS OR DERIVATIVE WORKS THEREOF, WILL NOT INFRINGE ANY
	* PATENT, COPYRIGHT, TRADEMARK, TRADE SECRET OR OTHER PROPRIETARY
	* RIGHT.
	*		*
	*********************************************************************/		* Unless required by applicable law or agreed to in writing, software
			* distributed under the License is distributed on an "AS IS" BASIS,
			* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
			* See the License for the specific language governing permissions and
			* limitations under the License.
			*
			***************************************************************/
	#ifndef __UTILS_H__		#ifndef __UTILS_H__
	#define __UTILS_H__		#define __UTILS_H__
	#include "common.h"		#include "classad/common.h"
	BEGIN_NAMESPACE( classad )		BEGIN_NAMESPACE( classad )
	// macro for recognising octal digits		// macro for recognising octal digits
	#define isodigit(x) (( (x) - '0' < 8 ) && ((x) - '0' >= 0))		#define isodigit(x) (( (x) - '0' < 8 ) && ((x) - '0' >= 0))
	// A structure which represents the Absolute Time Literal		// A structure which represents the Absolute Time Literal
	struct abstime_t		struct abstime_t
	{		{
	time_t secs; // seconds from the epoch (UTC)		time_t secs; // seconds from the epoch (UTC)
End of changes. 6 change blocks.
	19 lines changed or deleted		15 lines changed or added

	value.h		value.h
	/*********************************************************************		/***************************************************************
	*		*
	* Condor ClassAd library		* Copyright (C) 1990-2007, Condor Team, Computer Sciences Department,
	* Copyright (C) 1990-2003, Condor Team, Computer Sciences Department,		* University of Wisconsin-Madison, WI.
	* University of Wisconsin-Madison, WI and Rajesh Raman.
	*		*
	* This source code is covered by the Condor Public License, which can		* Licensed under the Apache License, Version 2.0 (the "License"); you
	* be found in the accompanying LICENSE file, or online at		* may not use this file except in compliance with the License. You may
	* www.condorproject.org.		* obtain a copy of the License at
	*		*
	* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS		* http://www.apache.org/licenses/LICENSE-2.0
	* AND THE UNIVERSITY OF WISCONSIN-MADISON "AS IS" AND ANY EXPRESS OR
	* IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
	* WARRANTIES OF MERCHANTABILITY, OF SATISFACTORY QUALITY, AND FITNESS
	* FOR A PARTICULAR PURPOSE OR USE ARE DISCLAIMED. THE COPYRIGHT
	* HOLDERS AND CONTRIBUTORS AND THE UNIVERSITY OF WISCONSIN-MADISON
	* MAKE NO MAKE NO REPRESENTATION THAT THE SOFTWARE, MODIFICATIONS,
	* ENHANCEMENTS OR DERIVATIVE WORKS THEREOF, WILL NOT INFRINGE ANY
	* PATENT, COPYRIGHT, TRADEMARK, TRADE SECRET OR OTHER PROPRIETARY
	* RIGHT.
	*		*
	*********************************************************************/		* Unless required by applicable law or agreed to in writing, software
			* distributed under the License is distributed on an "AS IS" BASIS,
			* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
			* See the License for the specific language governing permissions and
			* limitations under the License.
			*
			***************************************************************/
	#ifndef __VALUES_H__		#ifndef __VALUES_H__
	#define __VALUES_H__		#define __VALUES_H__
	#include "common.h"		#include "classad/common.h"
	#include "util.h"		#include "classad/util.h"
	BEGIN_NAMESPACE( classad )		BEGIN_NAMESPACE( classad )
	class Literal;		class Literal;
	class ExprList;		class ExprList;
	class ClassAd;		class ClassAd;
	/// Represents the result of an evaluation.		/// Represents the result of an evaluation.
	class Value		class Value
	{		{
End of changes. 6 change blocks.
	20 lines changed or deleted		16 lines changed or added

	view.h		view.h
	/*********************************************************************		/***************************************************************
	*		*
	* Condor ClassAd library		* Copyright (C) 1990-2007, Condor Team, Computer Sciences Department,
	* Copyright (C) 1990-2003, Condor Team, Computer Sciences Department,		* University of Wisconsin-Madison, WI.
	* University of Wisconsin-Madison, WI and Rajesh Raman.
	*		*
	* This source code is covered by the Condor Public License, which can		* Licensed under the Apache License, Version 2.0 (the "License"); you
	* be found in the accompanying LICENSE file, or online at		* may not use this file except in compliance with the License. You may
	* www.condorproject.org.		* obtain a copy of the License at
	*		*
	* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS		* http://www.apache.org/licenses/LICENSE-2.0
	* AND THE UNIVERSITY OF WISCONSIN-MADISON "AS IS" AND ANY EXPRESS OR
	* IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
	* WARRANTIES OF MERCHANTABILITY, OF SATISFACTORY QUALITY, AND FITNESS
	* FOR A PARTICULAR PURPOSE OR USE ARE DISCLAIMED. THE COPYRIGHT
	* HOLDERS AND CONTRIBUTORS AND THE UNIVERSITY OF WISCONSIN-MADISON
	* MAKE NO MAKE NO REPRESENTATION THAT THE SOFTWARE, MODIFICATIONS,
	* ENHANCEMENTS OR DERIVATIVE WORKS THEREOF, WILL NOT INFRINGE ANY
	* PATENT, COPYRIGHT, TRADEMARK, TRADE SECRET OR OTHER PROPRIETARY
	* RIGHT.
	*		*
	*********************************************************************/		* Unless required by applicable law or agreed to in writing, software
			* distributed under the License is distributed on an "AS IS" BASIS,
			* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
			* See the License for the specific language governing permissions and
			* limitations under the License.
			*
			***************************************************************/
	#ifndef __VIEW_H__		#ifndef __VIEW_H__
	#define __VIEW_H__		#define __VIEW_H__
	// STL includes		// STL includes
	#include <string>		#include <string>
	#include <set>		#include <set>
	#include "classad_stl.h"		#include "classad/classad_stl.h"
	#include "exprTree.h"		#include "classad/exprTree.h"
	#include "matchClassad.h"		#include "classad/matchClassad.h"
	BEGIN_NAMESPACE( classad )		BEGIN_NAMESPACE( classad )
	// class declarations		// class declarations
	class ExprTree;		class ExprTree;
	class ClassAd;		class ClassAd;
	class View;		class View;
	class ClassAdCollection;		class ClassAdCollection;
	class ClassAdCollectionServer;		class ClassAdCollectionServer;
End of changes. 6 change blocks.
	21 lines changed or deleted		17 lines changed or added

	xmlLexer.h		xmlLexer.h
	/*********************************************************************		/***************************************************************
	*		*
	* Condor ClassAd library		* Copyright (C) 1990-2007, Condor Team, Computer Sciences Department,
	* Copyright (C) 1990-2003, Condor Team, Computer Sciences Department,		* University of Wisconsin-Madison, WI.
	* University of Wisconsin-Madison, WI and Rajesh Raman.
	*		*
	* This source code is covered by the Condor Public License, which can		* Licensed under the Apache License, Version 2.0 (the "License"); you
	* be found in the accompanying LICENSE file, or online at		* may not use this file except in compliance with the License. You may
	* www.condorproject.org.		* obtain a copy of the License at
	*		*
	* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS		* http://www.apache.org/licenses/LICENSE-2.0
	* AND THE UNIVERSITY OF WISCONSIN-MADISON "AS IS" AND ANY EXPRESS OR
	* IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
	* WARRANTIES OF MERCHANTABILITY, OF SATISFACTORY QUALITY, AND FITNESS
	* FOR A PARTICULAR PURPOSE OR USE ARE DISCLAIMED. THE COPYRIGHT
	* HOLDERS AND CONTRIBUTORS AND THE UNIVERSITY OF WISCONSIN-MADISON
	* MAKE NO MAKE NO REPRESENTATION THAT THE SOFTWARE, MODIFICATIONS,
	* ENHANCEMENTS OR DERIVATIVE WORKS THEREOF, WILL NOT INFRINGE ANY
	* PATENT, COPYRIGHT, TRADEMARK, TRADE SECRET OR OTHER PROPRIETARY
	* RIGHT.
	*		*
	*********************************************************************/		* Unless required by applicable law or agreed to in writing, software
			* distributed under the License is distributed on an "AS IS" BASIS,
			* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
			* See the License for the specific language governing permissions and
			* limitations under the License.
			*
			***************************************************************/
	#ifndef __XMLLEXER_H__		#ifndef __XMLLEXER_H__
	#define __XMLLEXER_H__		#define __XMLLEXER_H__
	#include "common.h"		#include "classad/common.h"
	#include "lexerSource.h"		#include "classad/lexerSource.h"
	#include <map>		#include <map>
	BEGIN_NAMESPACE( classad )		BEGIN_NAMESPACE( classad )
	typedef std::map<std::string, std::string> XMLAttributes;		typedef std::map<std::string, std::string> XMLAttributes;
	typedef std::map<std::string, std::string>::iterator XMLAttributesIterator;		typedef std::map<std::string, std::string>::iterator XMLAttributesIterator;
	// the lexical analyzer class		// the lexical analyzer class
	class XMLLexer		class XMLLexer
	{		{
	skipping to change at line 113		skipping to change at line 109
	bool GrabToken(void);		bool GrabToken(void);
	bool GrabTag(void);		bool GrabTag(void);
	void BreakdownTag(const char *complete_tag);		void BreakdownTag(const char *complete_tag);
	bool GrabText(void);		bool GrabText(void);
	private:		private:
	// The copy constructor and assignment operator are defined		// The copy constructor and assignment operator are defined
	// to be private so we don't have to write them, or worry about		// to be private so we don't have to write them, or worry about
	// them being inappropriately used. The day we want them, we can		// them being inappropriately used. The day we want them, we can
	// write them.		// write them.
	XMLLexer(const XMLLexer &lexer) { return; }		XMLLexer(const XMLLexer &) { return; }
	XMLLexer &operator=(const XMLLexer &lexer) { return *this; }		XMLLexer &operator=(const XMLLexer &) { return *this; }
	};		};
	struct xml_tag_mapping		struct xml_tag_mapping
	{		{
	char *tag_name;		char *tag_name;
	XMLLexer::TagID id;		XMLLexer::TagID id;
	};		};
	#define NUMBER_OF_TAG_MAPPINGS (sizeof(tag_mappings)/sizeof(struct xml_tag_ mapping))		#define NUMBER_OF_TAG_MAPPINGS (sizeof(tag_mappings)/sizeof(struct xml_tag_ mapping))
	extern struct xml_tag_mapping tag_mappings[];		extern struct xml_tag_mapping tag_mappings[];
End of changes. 7 change blocks.
	22 lines changed or deleted		18 lines changed or added

	xmlSink.h		xmlSink.h
	/*********************************************************************		/***************************************************************
	*		*
	* Condor ClassAd library		* Copyright (C) 1990-2007, Condor Team, Computer Sciences Department,
	* Copyright (C) 1990-2003, Condor Team, Computer Sciences Department,		* University of Wisconsin-Madison, WI.
	* University of Wisconsin-Madison, WI and Rajesh Raman.
	*		*
	* This source code is covered by the Condor Public License, which can		* Licensed under the Apache License, Version 2.0 (the "License"); you
	* be found in the accompanying LICENSE file, or online at		* may not use this file except in compliance with the License. You may
	* www.condorproject.org.		* obtain a copy of the License at
	*		*
	* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS		* http://www.apache.org/licenses/LICENSE-2.0
	* AND THE UNIVERSITY OF WISCONSIN-MADISON "AS IS" AND ANY EXPRESS OR
	* IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
	* WARRANTIES OF MERCHANTABILITY, OF SATISFACTORY QUALITY, AND FITNESS
	* FOR A PARTICULAR PURPOSE OR USE ARE DISCLAIMED. THE COPYRIGHT
	* HOLDERS AND CONTRIBUTORS AND THE UNIVERSITY OF WISCONSIN-MADISON
	* MAKE NO MAKE NO REPRESENTATION THAT THE SOFTWARE, MODIFICATIONS,
	* ENHANCEMENTS OR DERIVATIVE WORKS THEREOF, WILL NOT INFRINGE ANY
	* PATENT, COPYRIGHT, TRADEMARK, TRADE SECRET OR OTHER PROPRIETARY
	* RIGHT.
	*		*
	*********************************************************************/		* Unless required by applicable law or agreed to in writing, software
			* distributed under the License is distributed on an "AS IS" BASIS,
			* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
			* See the License for the specific language governing permissions and
			* limitations under the License.
			*
			***************************************************************/
	#ifndef __XMLSINK_H__		#ifndef __XMLSINK_H__
	#define __XMLSINK_H__		#define __XMLSINK_H__
	#include "common.h"		#include "classad/common.h"
	#include "exprTree.h"		#include "classad/exprTree.h"
	#include <vector>		#include <vector>
	#include <utility> // for pair template		#include <utility> // for pair template
	#include <string>		#include <string>
	BEGIN_NAMESPACE( classad )		BEGIN_NAMESPACE( classad )
	/// This converts a ClassAd into an XML string representing the %ClassAd		/// This converts a ClassAd into an XML string representing the %ClassAd
	class ClassAdXMLUnParser		class ClassAdXMLUnParser
	{		{
	public:		public:
End of changes. 6 change blocks.
	20 lines changed or deleted		16 lines changed or added

	xmlSource.h		xmlSource.h
	/*********************************************************************		/***************************************************************
	*		*
	* Condor ClassAd library		* Copyright (C) 1990-2007, Condor Team, Computer Sciences Department,
	* Copyright (C) 1990-2003, Condor Team, Computer Sciences Department,		* University of Wisconsin-Madison, WI.
	* University of Wisconsin-Madison, WI and Rajesh Raman.
	*		*
	* This source code is covered by the Condor Public License, which can		* Licensed under the Apache License, Version 2.0 (the "License"); you
	* be found in the accompanying LICENSE file, or online at		* may not use this file except in compliance with the License. You may
	* www.condorproject.org.		* obtain a copy of the License at
	*		*
	* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS		* http://www.apache.org/licenses/LICENSE-2.0
	* AND THE UNIVERSITY OF WISCONSIN-MADISON "AS IS" AND ANY EXPRESS OR
	* IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
	* WARRANTIES OF MERCHANTABILITY, OF SATISFACTORY QUALITY, AND FITNESS
	* FOR A PARTICULAR PURPOSE OR USE ARE DISCLAIMED. THE COPYRIGHT
	* HOLDERS AND CONTRIBUTORS AND THE UNIVERSITY OF WISCONSIN-MADISON
	* MAKE NO MAKE NO REPRESENTATION THAT THE SOFTWARE, MODIFICATIONS,
	* ENHANCEMENTS OR DERIVATIVE WORKS THEREOF, WILL NOT INFRINGE ANY
	* PATENT, COPYRIGHT, TRADEMARK, TRADE SECRET OR OTHER PROPRIETARY
	* RIGHT.
	*		*
	*********************************************************************/		* Unless required by applicable law or agreed to in writing, software
			* distributed under the License is distributed on an "AS IS" BASIS,
			* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
			* See the License for the specific language governing permissions and
			* limitations under the License.
			*
			***************************************************************/
	#ifndef __XMLSOURCE_H__		#ifndef __XMLSOURCE_H__
	#define __XMLSOURCE_H__		#define __XMLSOURCE_H__
	#include "xmlLexer.h"		#include "classad/xmlLexer.h"
	BEGIN_NAMESPACE( classad )		BEGIN_NAMESPACE( classad )
	class ClassAd;		class ClassAd;
	class ClassAdXMLParser		class ClassAdXMLParser
	{		{
	public:		public:
	ClassAdXMLParser();		ClassAdXMLParser();
	~ClassAdXMLParser();		~ClassAdXMLParser();
	skipping to change at line 51		skipping to change at line 47
	ClassAd *ParseClassAd(std::istream& stream);		ClassAd *ParseClassAd(std::istream& stream);
	bool ParseClassAd(const std::string &buffer, ClassAd &ad, in t &offset);		bool ParseClassAd(const std::string &buffer, ClassAd &ad, in t &offset);
	bool ParseClassAd(const std::string &buffer, ClassAd &ad);		bool ParseClassAd(const std::string &buffer, ClassAd &ad);
	bool ParseClassAd(FILE *file, ClassAd &ad);		bool ParseClassAd(FILE *file, ClassAd &ad);
	bool ParseClassAd(std::istream& stream, ClassAd &ad);		bool ParseClassAd(std::istream& stream, ClassAd &ad);
	private:		private:
	// The copy constructor and assignment operator are defined		// The copy constructor and assignment operator are defined
	// to be private so we don't have to write them, or worry about		// to be private so we don't have to write them, or worry about
	// them being inappropriately used. The day we want them, we can		// them being inappropriately used. The day we want them, we can
	// write them.		// write them.
	ClassAdXMLParser(const ClassAdXMLParser &parser) { retur		ClassAdXMLParser(const ClassAdXMLParser &) { return;
	n; }		}
	ClassAdXMLParser &operator=(const ClassAdXMLParser &parser) { retur		ClassAdXMLParser &operator=(const ClassAdXMLParser &) { return *thi
	n *this; }		s; }
	ClassAd *ParseClassAd(void);		ClassAd *ParseClassAd(void);
	ExprTree *ParseAttribute(std::string &attribute_name);		ExprTree *ParseAttribute(std::string &attribute_name);
	ExprTree *ParseThing(void);		ExprTree *ParseThing(void);
	ExprTree *ParseList(void);		ExprTree *ParseList(void);
	ExprTree *ParseNumberOrString(XMLLexer::TagID tag_id);		ExprTree *ParseNumberOrString(XMLLexer::TagID tag_id);
	ExprTree *ParseBool(void);		ExprTree *ParseBool(void);
	ExprTree *ParseUndefinedOrError(XMLLexer::TagID tag_id);		ExprTree *ParseUndefinedOrError(XMLLexer::TagID tag_id);
	ExprTree *ParseAbsTime(void);		ExprTree *ParseAbsTime(void);
	ExprTree *ParseRelTime(void);		ExprTree *ParseRelTime(void);
End of changes. 7 change blocks.
	23 lines changed or deleted		19 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/