common.h   common.h 
skipping to change at line 49 skipping to change at line 49
#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 calling posix functions like open()
// instead of _open()
#define _CRT_NONSTDC_NO_WARNINGS
// Disable warnings about possible loss of data, since "we know what // Disable warnings about possible loss of data, since "we know what
// we are doing" and fixing them correctly would require too much // we are doing" and fixing them correctly would require too much
// time from one of us. (Maybe this should be a student exercise.) // time from one of us. (Maybe this should be a student exercise.)
#pragma warning( disable : 4244 ) #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>
skipping to change at line 69 skipping to change at line 73
#include <limits.h> #include <limits.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>
#ifdef WIN32 #ifdef WIN32
// special definitions we need for Windows // special definitions we need for Windows
#ifndef DLL_IMPORT_MAGIC #ifndef DLL_IMPORT_MAGIC
#define DLL_IMPORT_MAGIC __declspec(dllimport) #define DLL_IMPORT_MAGIC __declspec(dllimport)
#endif #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
#endif
#define strcasecmp _stricmp #define strcasecmp _stricmp
#ifndef rint #ifndef rint
#define rint(num) floor(num + .5) #define rint(num) floor(num + .5)
#endif #endif
#define isnan _isnan #define isnan _isnan
// isinf() defined in util.h // isinf() defined in util.h
#ifdef WIN32
#include <hash_map> #include <hash_map>
#endif
#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 )
 End of changes. 5 change blocks. 
5 lines changed or deleted 5 lines changed or added


 sink.h   sink.h 
skipping to change at line 83 skipping to change at line 83
virtual void UnparseAux(std::string &buffer, std::string &fn Name, virtual void UnparseAux(std::string &buffer, std::string &fn Name,
std::vector<ExprTree*>& args); std::vector<ExprTree*>& args);
virtual void UnparseAux( std::string &buffer, virtual void UnparseAux( std::string &buffer,
std::vector< std::pair< std::string, ExprTree*> >& attrlist ); std::vector< std::pair< std::string, ExprTree*> >& attrlist );
virtual void UnparseAux( std::string &buffer, std::vector<Ex prTree*>& ); virtual void UnparseAux( std::string &buffer, std::vector<Ex prTree*>& );
// to unparse attribute names (quoted & unquoted attributes) // to unparse attribute names (quoted & unquoted attributes)
virtual void UnparseAux( std::string &buffer, std::string id entifier); virtual void UnparseAux( std::string &buffer, std::string id entifier);
// table of string representation of operators // table of string representation of operators
static char *opString[]; static const char *opString[];
protected: protected:
bool oldClassAd; bool oldClassAd;
bool xmlUnparse; bool xmlUnparse;
char delimiter; // string delimiter - initialized to '\"' in the constructor char delimiter; // string delimiter - initialized to '\"' in the constructor
}; };
/// This is a special case of the ClassAdParser which prints the ClassAds m ore nicely. /// This is a special case of the ClassAdParser which prints the ClassAds m ore nicely.
class PrettyPrint : public ClassAdUnParser class PrettyPrint : public ClassAdUnParser
{ {
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 lines changed or added


 xmlLexer.h   xmlLexer.h 
skipping to change at line 115 skipping to change at line 115
// 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 &) { return; } XMLLexer(const XMLLexer &) { return; }
XMLLexer &operator=(const XMLLexer &) { return *this; } XMLLexer &operator=(const XMLLexer &) { return *this; }
}; };
struct xml_tag_mapping struct xml_tag_mapping
{ {
char *tag_name; const 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_NAMESPACE // classad END_NAMESPACE // classad
#endif //__CLASSAD_XMLLEXER_H__ #endif //__CLASSAD_XMLLEXER_H__
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 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/