classads: headers diff between 1.0.1 and 1.0.3 versions

	classad.h	classad.h

	skipping to change at line 29	skipping to change at line 29

	#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/classad_stl.h"	#include "classad/classad_stl.h"
	#include "classad/exprTree.h"	#include "classad/exprTree.h"


		#ifdef CLASSAD_DEPRECATED
		class Stream;
		#endif

	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 "classad/rectangle.h"	#include "classad/rectangle.h"
	#endif	#endif


	#ifdef CLASSAD_DEPRECATED	typedef classad_hash_map<std::string, ExprTree*, CaseIgnLTStr> AttrList;
	#include "classad/stream.h"
	#endif

	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
	{	{
	/** \mainpage C++ ClassAd API Documentation	/** \mainpage C++ ClassAd API Documentation
	* Welcome to the C++ ClassAd API Documentation.	* Welcome to the C++ ClassAd API Documentation.

	skipping to change at line 686	skipping to change at line 686

	/** Read the old ClassAd from the stream, and fill in this ClassAd.	/** Read the old ClassAd from the stream, and fill in this ClassAd.
	* @param s the stream	* @param s the stream
	*/	*/
	int initFromStream(Stream& s);	int initFromStream(Stream& s);

	/** Print the ClassAd as an old ClassAd to the FILE	/** Print the ClassAd as an old ClassAd to the FILE
	@param file The file handle to print to.	@param file The file handle to print to.
	@return TRUE	@return TRUE
	*/	*/

	virtual int fPrint(FILE *file);	int fPrint(FILE *file);

	/** Print the ClassAd as an old ClasAd with dprintf	/** Print the ClassAd as an old ClasAd with dprintf
	@param level The dprintf level.	@param level The dprintf level.
	*/	*/
	void dPrint( int level);	void dPrint( int level);

	bool AddExplicitConditionals( ExprTree expr, ExprTree &new Expr );	bool AddExplicitConditionals( ExprTree expr, ExprTree &new Expr );
	ClassAd *AddExplicitTargetRefs( );	ClassAd *AddExplicitTargetRefs( );
	//@}	//@}
	#endif	#endif

End of changes. 3 change blocks.
	7 lines changed or deleted	6 lines changed or added

	classadErrno.h	classadErrno.h

	skipping to change at line 27	skipping to change at line 27
	*	*
	***************************************************************/	***************************************************************/

	#ifndef __CLASSAD_ERRNO_H__	#ifndef __CLASSAD_ERRNO_H__
	#define __CLASSAD_ERRNO_H__	#define __CLASSAD_ERRNO_H__

	#include "classad/common.h"	#include "classad/common.h"

	BEGIN_NAMESPACE(classad)	BEGIN_NAMESPACE(classad)


	// bring in Condor system errors used if not in Condor
	#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

	static const int ERR_BAD_VALUE = 255;	static const int ERR_BAD_VALUE = 255;
	static const int ERR_FAILED_SET_VIEW_NAME = 256;	static const int ERR_FAILED_SET_VIEW_NAME = 256;
	static const int ERR_NO_RANK_EXPR = 257;	static const int ERR_NO_RANK_EXPR = 257;
	static const int ERR_NO_REQUIREMENTS_EXPR = 258;	static const int ERR_NO_REQUIREMENTS_EXPR = 258;
	static const int ERR_BAD_PARTITION_EXPRS = 259;	static const int ERR_BAD_PARTITION_EXPRS = 259;
	static const int ERR_PARTITION_EXISTS = 260;	static const int ERR_PARTITION_EXISTS = 260;
	static const int ERR_MISSING_ATTRNAME = 261;	static const int ERR_MISSING_ATTRNAME = 261;
	static const int ERR_BAD_EXPRESSION = 262;	static const int ERR_BAD_EXPRESSION = 262;
	static const int ERR_INVALID_IDENTIFIER = 263;	static const int ERR_INVALID_IDENTIFIER = 263;

End of changes. 2 change blocks.
	3 lines changed or deleted	0 lines changed or added

	classad_distribution.h	classad_distribution.h

	skipping to change at line 23	skipping to change at line 23
	* distributed under the License is distributed on an "AS IS" BASIS,	* distributed under the License is distributed on an "AS IS" BASIS,
	* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.	* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
	* See the License for the specific language governing permissions and	* See the License for the specific language governing permissions and
	* limitations under the License.	* limitations under the License.
	*	*
	***************************************************************/	***************************************************************/

	#ifndef __CLASSAD_DISTRIBUTION_H__	#ifndef __CLASSAD_DISTRIBUTION_H__
	#define __CLASSAD_DISTRIBUTION_H__	#define __CLASSAD_DISTRIBUTION_H__


	#ifndef CLASSAD_DISTRIBUTION
	#define CLASSAD_DISTRIBUTION
	#endif

	#include "classad/common.h"	#include "classad/common.h"
	#include "classad/classad.h"	#include "classad/classad.h"
	#include "classad/source.h"	#include "classad/source.h"
	#include "classad/sink.h"	#include "classad/sink.h"
	#include "classad/xmlSource.h"	#include "classad/xmlSource.h"
	#include "classad/xmlSink.h"	#include "classad/xmlSink.h"
	#include "classad/matchClassad.h"	#include "classad/matchClassad.h"
	#include "classad/collection.h"	#include "classad/collection.h"
	#include "classad/collectionBase.h"	#include "classad/collectionBase.h"
	#include "classad/query.h"	#include "classad/query.h"

End of changes. 1 change blocks.
	4 lines changed or deleted	0 lines changed or added

	classad_stl.h	classad_stl.h

	skipping to change at line 23	skipping to change at line 23
	* distributed under the License is distributed on an "AS IS" BASIS,	* distributed under the License is distributed on an "AS IS" BASIS,
	* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.	* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
	* See the License for the specific language governing permissions and	* See the License for the specific language governing permissions and
	* limitations under the License.	* limitations under the License.
	*	*
	***************************************************************/	***************************************************************/

	#ifndef __CLASSAD_STL_H__	#ifndef __CLASSAD_STL_H__
	#define __CLASSAD_STL_H__	#define __CLASSAD_STL_H__


	#if USING_STLPORT	#include <map>
	#include <hash_map>	#include <list>
	#include <slist>
	#elif defined(__GNUC__)
	#if (__GNUC__<3)
	#include <hash_map>
	#include <slist>
	#else
	#include <string>
	#include <ext/hash_map>
	#include <ext/slist>
	using namespace __gnu_cxx;
	#endif
	#elif defined(WIN32)
	#include <hash_map>
	#include <slist>
	#else
	#include <hash_map>
	#endif


	#if USING_STLPORT	#define classad_hash_map std::map
	#define classad_hash_map std::hash_map	#define classad_slist std::list
	#define classad_slist std::slist
	#elif defined(__GNUC__)
	#if ((__GNUC__ == 3 && __GNUC_MINOR__ > 0) \|\| (__GNUC__ > 3))
	#define classad_hash_map __gnu_cxx::hash_map
	#define classad_slist __gnu_cxx::slist
	#else
	#define classad_hash_map std::hash_map
	#define classad_slist std::slist
	#endif
	#elif defined (WIN32)
	#define classad_hash_map std::hash_map
	#define classad_slist std::slist
	#else
	#define classad_hash_map std::hash_map
	#define classad_slist std::slist
	#endif

	#endif /* __CLASSAD_STL_H__ */	#endif /* __CLASSAD_STL_H__ */

End of changes. 2 change blocks.
	37 lines changed or deleted	4 lines changed or added

	collectionBase.h	collectionBase.h

	skipping to change at line 45	skipping to change at line 45
	class ServerTransaction;	class ServerTransaction;

	class ClassAdProxy {	class ClassAdProxy {
	public:	public:
	ClassAdProxy( ){ ad=NULL; };	ClassAdProxy( ){ ad=NULL; };
	~ClassAdProxy( ){ };	~ClassAdProxy( ){ };

	ClassAd *ad;	ClassAd *ad;
	};	};


	typedef classad_hash_map<std::string,View*,StringHash> ViewRegistry;	typedef classad_hash_map<std::string,View*> ViewRegistry;
	typedef classad_hash_map<std::string,ClassAdProxy,StringHash> ClassAdTable;	typedef classad_hash_map<std::string,ClassAdProxy> ClassAdTable;
	typedef classad_hash_map<std::string,ServerTransaction*,StringHash> Xaction	typedef classad_hash_map<std::string,ServerTransaction*> XactionTable;
	Table;

	/** A ClassAdCollection stores a set of ClassAds. It is similar to a	/** A ClassAdCollection stores a set of ClassAds. It is similar to a
	hash table, but with more interesting querying capabilities. */	hash table, but with more interesting querying capabilities. */
	class ClassAdCollection : public ClassAdCollectionInterface {	class ClassAdCollection : public ClassAdCollectionInterface {
	public:	public:
	/**@name Constructors/Destructor	/**@name Constructors/Destructor
	* Note that the ClassAdCollection constructors talk about caching.	* Note that the ClassAdCollection constructors talk about caching.
	* If caching is off, all ClassAds are stored in memory. For large	* If caching is off, all ClassAds are stored in memory. For large
	* collections, this may be a problem. If caching is on, only some	* collections, this may be a problem. If caching is on, only some
	* ClassAds will be kept in memory, and all of them will be written	* ClassAds will be kept in memory, and all of them will be written

End of changes. 1 change blocks.
	4 lines changed or deleted	3 lines changed or added

	common.h	common.h

	skipping to change at line 23	skipping to change at line 23
	* distributed under the License is distributed on an "AS IS" BASIS,	* distributed under the License is distributed on an "AS IS" BASIS,
	* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.	* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
	* See the License for the specific language governing permissions and	* See the License for the specific language governing permissions and
	* limitations under the License.	* limitations under the License.
	*	*
	***************************************************************/	***************************************************************/

	#ifndef __COMMON_H__	#ifndef __COMMON_H__
	#define __COMMON_H__	#define __COMMON_H__


		#ifndef WIN32
	#include <strings.h>	#include <strings.h>

		#endif

	#if defined( WANT_CLASSAD_NAMESPACE ) && defined(__cplusplus)	#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
	#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

	#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


		// Disable warnings about possible loss of data, since "we know what
		// we are doing" and fixing them correctly would require too much
		// time from one of us. (Maybe this should be a student exercise.)
		#pragma warning( disable : 4244 )

	#endif /* WIN32 */	#endif /* WIN32 */

	#include <stdio.h>	#include <stdio.h>
	#include <stdlib.h>	#include <stdlib.h>
	#include <time.h>	#include <time.h>
	#include <math.h>	#include <math.h>
	#ifndef WIN32	#ifndef WIN32
	#include <unistd.h>	#include <unistd.h>
	#define DLL_IMPORT_MAGIC /* a no-op on Unix */	#define DLL_IMPORT_MAGIC /* a no-op on Unix */
	#endif	#endif
	#include <errno.h>	#include <errno.h>
	#include <ctype.h>	#include <ctype.h>

	#ifndef WORD_BIT	#ifndef WORD_BIT
	#define WORD_BIT 32	#define WORD_BIT 32
	#endif	#endif

	#ifdef WIN32	#ifdef WIN32
	// special definitions we need for Windows	// special definitions we need for Windows

		#ifndef DLL_IMPORT_MAGIC
	#define DLL_IMPORT_MAGIC __declspec(dllimport)	#define DLL_IMPORT_MAGIC __declspec(dllimport)

		#endif
	#include <windows.h>	#include <windows.h>
	#include <float.h>	#include <float.h>
	#include <io.h>	#include <io.h>
	#define fsync _commit	#define fsync _commit

		#ifndef open
	#define open _open	#define open _open

		#endif
	#define strcasecmp _stricmp	#define strcasecmp _stricmp

		#ifndef rint
	#define rint(num) floor(num + .5)	#define rint(num) floor(num + .5)

		#endif
	#define isnan _isnan	#define isnan _isnan
	// isinf() defined in util.h	// isinf() defined in util.h

	#define snprintf _snprintf	#define snprintf _snprintf

	// Disable warnings about multiple template instantiations	// Disable warnings about multiple template instantiations
	// (done for gcc)	// (done for gcc)
	#pragma warning( disable : 4660 )	#pragma warning( disable : 4660 )
	// Disable warnings about forcing bools	// Disable warnings about forcing bools
	#pragma warning( disable : 4800 )	#pragma warning( disable : 4800 )
	// Disable warnings about truncated debug identifiers	// Disable warnings about truncated debug identifiers
	#pragma warning( disable : 4786 )	#pragma warning( disable : 4786 )
	#endif // WIN32	#endif // WIN32


	#else /* CLASSAD_DISTRIBUTION isn't defined */

	#ifndef _POSIX_C_SOURCE
	#define _POSIX_C_SOURCE 199506L /* To get asctime_r */
	#endif

	#include "condor_common.h"
	#include "condor_debug.h"
	#include "condor_attributes.h"
	#endif /* CLASSAD_DISTRIBUTION */

	#include "classad/debug.h"	#include "classad/debug.h"

	#ifdef __cplusplus	#ifdef __cplusplus
	#include <string>	#include <string>
	#endif	#endif

		#include <cstring>
		#include <string.h>

	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" ;
	static const char ATTR_DELETE_AD [] = "DeleteAd" ;	static const char ATTR_DELETE_AD [] = "DeleteAd" ;
	static const char ATTR_DELETES [] = "Deletes";	static const char ATTR_DELETES [] = "Deletes";
	static const char ATTR_KEY [] = "K ey";	static const char ATTR_KEY [] = "K ey";
	static const char ATTR_NEW_AD [] = "NewAd";	static const char ATTR_NEW_AD [] = "NewAd";

	skipping to change at line 132	skipping to change at line 135
	static const char ATTR_SUBORDINATE_VIEWS [] = "SubordinateViews" ;	static const char ATTR_SUBORDINATE_VIEWS [] = "SubordinateViews" ;
	static const char ATTR_UPDATES [] = "Updates";	static const char ATTR_UPDATES [] = "Updates";
	static const char ATTR_WANT_LIST [] = "WantList" ;	static const char ATTR_WANT_LIST [] = "WantList" ;
	static const char ATTR_WANT_PRELUDE [] = "WantPrelu de";	static const char ATTR_WANT_PRELUDE [] = "WantPrelu de";
	static const char ATTR_WANT_RESULTS [] = "WantResul ts";	static const char ATTR_WANT_RESULTS [] = "WantResul ts";
	static const char ATTR_WANT_POSTLUDE [] = "WantPostlude";	static const char ATTR_WANT_POSTLUDE [] = "WantPostlude";
	static const char ATTR_VIEW_INFO [] = "ViewInfo" ;	static const char ATTR_VIEW_INFO [] = "ViewInfo" ;
	static const char ATTR_VIEW_NAME [] = "ViewName" ;	static const char ATTR_VIEW_NAME [] = "ViewName" ;
	static const char ATTR_XACTION_NAME [] = "XactionNa me";	static const char ATTR_XACTION_NAME [] = "XactionNa me";


	#if defined( CLASSAD_DISTRIBUTION )
	static const char ATTR_REQUIREMENTS [] = "Requireme nts";	static const char ATTR_REQUIREMENTS [] = "Requireme nts";
	static const char ATTR_RANK [] = "R ank";	static const char ATTR_RANK [] = "R ank";

	#endif

	#if defined(__cplusplus)	#if defined(__cplusplus)
	struct CaseIgnLTStr {	struct CaseIgnLTStr {
	bool operator( )( const std::string &s1, const std::string &s2 ) const {	bool operator( )( const std::string &s1, const std::string &s2 ) const {
	return( strcasecmp( s1.c_str( ), s2.c_str( ) ) < 0 );	return( strcasecmp( s1.c_str( ), s2.c_str( ) ) < 0 );
	}	}
	};	};

	struct CaseIgnEqStr {	struct CaseIgnEqStr {
	bool operator( )( const std::string &s1, const std::string &s2 ) con st {	bool operator( )( const std::string &s1, const std::string &s2 ) con st {

	skipping to change at line 186	skipping to change at line 187
	extern std::string CondorErrMsg;	extern std::string CondorErrMsg;
	#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)
	#include "classad/classadErrno.h"	#include "classad/classadErrno.h"

	#else
	#include "condor_errno.h"
	#endif

	#endif//__COMMON_H__	#endif//__COMMON_H__

End of changes. 16 change blocks.
	18 lines changed or deleted	15 lines changed or added

	exprTree.h	exprTree.h

	skipping to change at line 34	skipping to change at line 34
	#include "classad/common.h"	#include "classad/common.h"
	#include "classad/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 > EvalCache;

	class EvalState {	class EvalState {
	public:	public:
	EvalState( );	EvalState( );
	~EvalState( );	~EvalState( );

	void SetRootScope( );	void SetRootScope( );
	void SetScopes( const ClassAd* );	void SetScopes( const ClassAd* );

	EvalCache cache;	EvalCache cache;

End of changes. 1 change blocks.
	1 lines changed or deleted	1 lines changed or added

	indexfile.h	indexfile.h

	skipping to change at line 60	skipping to change at line 60
	bool WriteBack(std::string key, std::string ad);	bool WriteBack(std::string key, std::string ad);
	//should delete it from file and index	//should delete it from file and index
	bool DeleteFromStorageFile(std::string key);	bool DeleteFromStorageFile(std::string key);
	bool UpdateIndex(std::string key, int offset);	bool UpdateIndex(std::string key, int offset);
	int First(std::string &key);	int First(std::string &key);
	int Next(std::string &key);	int Next(std::string &key);
	std::string GetClassadFromFile(std::string key, int offset);	std::string GetClassadFromFile(std::string key, int offset);
	bool TruncateStorageFile();	bool TruncateStorageFile();
	int dump_index();	int dump_index();
	private:	private:

	classad_hash_map<std::string,int,StringHash> Index;	classad_hash_map<std::string,int> Index;
	classad_hash_map<std::string,int,StringHash>::iterator index_itr;	classad_hash_map<std::string,int>::iterator index_itr;
	int filed;	int filed;
	};	};

	END_NAMESPACE	END_NAMESPACE

End of changes. 1 change blocks.
	2 lines changed or deleted	2 lines changed or added

	literals.h	literals.h

	skipping to change at line 23	skipping to change at line 23
	* distributed under the License is distributed on an "AS IS" BASIS,	* distributed under the License is distributed on an "AS IS" BASIS,
	* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.	* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
	* See the License for the specific language governing permissions and	* See the License for the specific language governing permissions and
	* limitations under the License.	* limitations under the License.
	*	*
	***************************************************************/	***************************************************************/

	#ifndef __LITERALS_H__	#ifndef __LITERALS_H__
	#define __LITERALS_H__	#define __LITERALS_H__


		#include <vector>

	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.
	*/	*/
	class Literal : public ExprTree	class Literal : public ExprTree
	{	{
	public:	public:

End of changes. 1 change blocks.
	0 lines changed or deleted	2 lines changed or added

	transaction.h	transaction.h

	skipping to change at line 28	skipping to change at line 28
	***************************************************************/	***************************************************************/

	#ifndef __XACTION_H__	#ifndef __XACTION_H__
	#define __XACTION_H__	#define __XACTION_H__

	#include <list>	#include <list>
	#include <string>	#include <string>
	#include "classad/sink.h"	#include "classad/sink.h"
	#include "classad/view.h"	#include "classad/view.h"


		class Sock;

	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 & ) const { return false; }	bool operator==( const XactionRecord & ) const { return false; }
	bool operator< ( const XactionRecord & ) const { return false; }	bool operator< ( const XactionRecord & ) const { return false; }

	skipping to change at line 78	skipping to change at line 80
	std::string xactionName;	std::string xactionName;
	bool local;	bool local;
	ClassAdCollection *server;	ClassAdCollection *server;
	CollectionOpList opList;	CollectionOpList opList;

	int xactionErrno;	int xactionErrno;
	std::string xactionErrMsg;	std::string xactionErrMsg;
	ClassAd *xactionErrCause;	ClassAd *xactionErrCause;
	};	};


	class Sock;

	class ClientTransaction {	class ClientTransaction {
	public:	public:
	ClientTransaction( );	ClientTransaction( );
	~ClientTransaction( );	~ClientTransaction( );

	inline void SetServerAddr( const std::string &a, int p ) { addr=a; p ort=p; }	inline void SetServerAddr( const std::string &a, int p ) { addr=a; p ort=p; }
	inline void GetServerAddr( std::string &a, int &p ) const { a=addr; p=port; }	inline void GetServerAddr( std::string &a, int &p ) const { a=addr; p=port; }
	inline void SetXactionName( const std::string &n ) { xactionName = n ; }	inline void SetXactionName( const std::string &n ) { xactionName = n ; }
	inline void GetXactionName( std::string &n ) const { n = xactionName ; }	inline void GetXactionName( std::string &n ) const { n = xactionName ; }
	inline void SetXactionState( char s ) { state = s; }	inline void SetXactionState( char s ) { state = s; }

End of changes. 2 change blocks.
	2 lines changed or deleted	2 lines changed or added

	view.h	view.h

	skipping to change at line 66	skipping to change at line 66
	Value rank;	Value rank;
	};	};

	struct ViewMemberLT {	struct ViewMemberLT {
	bool operator()( const ViewMember &vm1, const ViewMember &vm2 ) cons t;	bool operator()( const ViewMember &vm1, const ViewMember &vm2 ) cons t;
	};	};

	typedef std::string ViewName;	typedef std::string ViewName;
	typedef std::multiset<ViewMember, ViewMemberLT> ViewMembers;	typedef std::multiset<ViewMember, ViewMemberLT> ViewMembers;
	typedef classad_slist<View*> SubordinateViews;	typedef classad_slist<View*> SubordinateViews;

	typedef classad_hash_map<std::string,View*,StringHash> PartitionedViews;	typedef classad_hash_map<std::string,View*> PartitionedViews;
	typedef classad_hash_map<std::string,ViewMembers::iterator,StringHash> Memb	typedef classad_hash_map<std::string,ViewMembers::iterator> MemberIndex;
	erIndex;

	/* View class */	/* View class */
	class View {	class View {
	public:	public:
	View( View *parent );	View( View *parent );
	~View( );	~View( );

	// view control	// view control
	bool SetViewName( const ViewName &viewName );	bool SetViewName( const ViewName &viewName );
	bool SetConstraintExpr( ClassAdCollection *coll,	bool SetConstraintExpr( ClassAdCollection *coll,

End of changes. 1 change blocks.
	3 lines changed or deleted	2 lines changed or added

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