attrrefs.h   attrrefs.h 
skipping to change at line 20 skipping to change at line 20
* http://www.apache.org/licenses/LICENSE-2.0 * http://www.apache.org/licenses/LICENSE-2.0
* *
* Unless required by applicable law or agreed to in writing, software * Unless required by applicable law or agreed to in writing, software
* 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 __ATTRREFS_H__ #ifndef __CLASSAD_ATTRREFS_H__
#define __ATTRREFS_H__ #define __CLASSAD_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:
/// Copy Constructor /// Copy Constructor
AttributeReference(const AttributeReference &ref); AttributeReference(const AttributeReference &ref);
skipping to change at line 103 skipping to change at line 103
virtual bool _Flatten( EvalState&, Value&, ExprTree*&, int* ) const; virtual bool _Flatten( EvalState&, Value&, ExprTree*&, int* ) const;
int FindExpr( EvalState&, ExprTree*&, ExprTree*&, bool ) const; int FindExpr( EvalState&, ExprTree*&, ExprTree*&, bool ) const;
ExprTree *expr; ExprTree *expr;
bool absolute; bool absolute;
std::string attributeStr; std::string attributeStr;
}; };
END_NAMESPACE // classad END_NAMESPACE // classad
#endif//__ATTRREFS_H__ #endif//__CLASSAD_ATTRREFS_H__
 End of changes. 2 change blocks. 
2 lines changed or deleted 2 lines changed or added


 cclassad.h   cclassad.h 
skipping to change at line 20 skipping to change at line 20
* http://www.apache.org/licenses/LICENSE-2.0 * http://www.apache.org/licenses/LICENSE-2.0
* *
* Unless required by applicable law or agreed to in writing, software * Unless required by applicable law or agreed to in writing, software
* 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 __CCLASSAD_H_ #ifndef __CLASSAD_CCLASSAD_H_
#define __CCLASSAD_H_ #define __CLASSAD_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.
*/ */
#ifdef __cplusplus #ifdef __cplusplus
 End of changes. 1 change blocks. 
2 lines changed or deleted 2 lines changed or added


 classad.h   classad.h 
skipping to change at line 20 skipping to change at line 20
* http://www.apache.org/licenses/LICENSE-2.0 * http://www.apache.org/licenses/LICENSE-2.0
* *
* Unless required by applicable law or agreed to in writing, software * Unless required by applicable law or agreed to in writing, software
* 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_H__ #ifndef __CLASSAD_CLASSAD_H__
#define __CLASSAD_H__ #define __CLASSAD_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"
BEGIN_NAMESPACE( classad ) BEGIN_NAMESPACE( classad )
typedef std::set<std::string, CaseIgnLTStr> References; typedef std::set<std::string, CaseIgnLTStr> References;
skipping to change at line 695 skipping to change at line 695
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 "classad/classadItor.h" #include "classad/classadItor.h"
#endif//__CLASSAD_H__ #endif//__CLASSAD_CLASSAD_H__
 End of changes. 2 change blocks. 
2 lines changed or deleted 2 lines changed or added


 classadErrno.h   classadErrno.h 
skipping to change at line 20 skipping to change at line 20
* http://www.apache.org/licenses/LICENSE-2.0 * http://www.apache.org/licenses/LICENSE-2.0
* *
* Unless required by applicable law or agreed to in writing, software * Unless required by applicable law or agreed to in writing, software
* 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_ERRNO_H__ #ifndef __CLASSAD_CLASSAD_ERRNO_H__
#define __CLASSAD_ERRNO_H__ #define __CLASSAD_CLASSAD_ERRNO_H__
#include "classad/common.h" #include "classad/common.h"
BEGIN_NAMESPACE(classad) BEGIN_NAMESPACE(classad)
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;
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;
 End of changes. 1 change blocks. 
2 lines changed or deleted 2 lines changed or added


 classadItor.h   classadItor.h 
skipping to change at line 20 skipping to change at line 20
* http://www.apache.org/licenses/LICENSE-2.0 * http://www.apache.org/licenses/LICENSE-2.0
* *
* Unless required by applicable law or agreed to in writing, software * Unless required by applicable law or agreed to in writing, software
* 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_ITOR_H__ #ifndef __CLASSAD_CLASSAD_ITOR_H__
#define __CLASSAD_ITOR_H__ #define __CLASSAD_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
/// other ClassAds as well. Note that attributes will not be provided /// other ClassAds as well. Note that attributes will not be provided
/// in any specific order. Also, ClassAdIterator is a ``forward /// in any specific order. Also, ClassAdIterator is a ``forward
/// iterator'' only; i.e., there is no PreviousAttribute() method. /// iterator'' only; i.e., there is no PreviousAttribute() method.
skipping to change at line 99 skipping to change at line 99
return(ad?(itr==ad->attrList.end()):false); return(ad?(itr==ad->attrList.end()):false);
} }
private: private:
AttrList::const_iterator itr; AttrList::const_iterator itr;
const ClassAd *ad; const ClassAd *ad;
}; };
END_NAMESPACE // classad END_NAMESPACE // classad
#endif//CLASSAD_ITOR #endif//__CLASSAD_CLASSAD_ITOR_H__
 End of changes. 2 change blocks. 
2 lines changed or deleted 2 lines changed or added


 classad_distribution.h   classad_distribution.h 
skipping to change at line 20 skipping to change at line 20
* http://www.apache.org/licenses/LICENSE-2.0 * http://www.apache.org/licenses/LICENSE-2.0
* *
* Unless required by applicable law or agreed to in writing, software * Unless required by applicable law or agreed to in writing, software
* 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_CLASSAD_DISTRIBUTION_H__
#define __CLASSAD_DISTRIBUTION_H__ #define __CLASSAD_CLASSAD_DISTRIBUTION_H__
#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"
 End of changes. 1 change blocks. 
2 lines changed or deleted 2 lines changed or added


 classad_stl.h   classad_stl.h 
skipping to change at line 20 skipping to change at line 20
* http://www.apache.org/licenses/LICENSE-2.0 * http://www.apache.org/licenses/LICENSE-2.0
* *
* Unless required by applicable law or agreed to in writing, software * Unless required by applicable law or agreed to in writing, software
* 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_CLASSAD_STL_H__
#define __CLASSAD_STL_H__ #define __CLASSAD_CLASSAD_STL_H__
#include <map> #include <map>
#include <list> #include <list>
#ifdef WIN32 #ifdef WIN32
#include <hash_map> #include <hash_map>
#else #else
#include <ext/hash_map> #include <ext/hash_map>
#endif #endif
#ifdef WIN32 #ifdef WIN32
#define classad_hash_map stdext::hash_map #define classad_hash_map stdext::hash_map
#else #else
#define classad_hash_map __gnu_cxx::hash_map #define classad_hash_map __gnu_cxx::hash_map
#endif #endif
#define classad_map std::map #define classad_map std::map
#define classad_slist std::list #define classad_slist std::list
#endif /* __CLASSAD_STL_H__ */ #endif /* __CLASSAD_CLASSAD_STL_H__ */
 End of changes. 2 change blocks. 
2 lines changed or deleted 2 lines changed or added


 collection.h   collection.h 
skipping to change at line 20 skipping to change at line 20
* http://www.apache.org/licenses/LICENSE-2.0 * http://www.apache.org/licenses/LICENSE-2.0
* *
* Unless required by applicable law or agreed to in writing, software * Unless required by applicable law or agreed to in writing, software
* 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 __COLLECTION_H__ #ifndef __CLASSAD_COLLECTION_H__
#define __COLLECTION_H__ #define __CLASSAD_COLLECTION_H__
#include "classad/view.h" #include "classad/view.h"
#include "classad/source.h" #include "classad/source.h"
#include "classad/sink.h" #include "classad/sink.h"
BEGIN_NAMESPACE( classad ) BEGIN_NAMESPACE( classad )
class ClassAdCollectionInterface { class ClassAdCollectionInterface {
public: public:
ClassAdCollectionInterface( ); ClassAdCollectionInterface( );
 End of changes. 1 change blocks. 
2 lines changed or deleted 2 lines changed or added


 collectionBase.h   collectionBase.h 
skipping to change at line 20 skipping to change at line 20
* http://www.apache.org/licenses/LICENSE-2.0 * http://www.apache.org/licenses/LICENSE-2.0
* *
* Unless required by applicable law or agreed to in writing, software * Unless required by applicable law or agreed to in writing, software
* 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 __COLLECTION_BASE_H__ #ifndef __CLASSAD_COLLECTION_BASE_H__
#define __COLLECTION_BASE_H__ #define __CLASSAD_COLLECTION_BASE_H__
#include "classad/collection.h" #include "classad/collection.h"
#include "classad/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
 End of changes. 1 change blocks. 
2 lines changed or deleted 2 lines changed or added


 common.h   common.h 
skipping to change at line 20 skipping to change at line 20
* http://www.apache.org/licenses/LICENSE-2.0 * http://www.apache.org/licenses/LICENSE-2.0
* *
* Unless required by applicable law or agreed to in writing, software * Unless required by applicable law or agreed to in writing, software
* 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 __CLASSAD_COMMON_H__
#define __COMMON_H__ #define __CLASSAD_COMMON_H__
#ifndef WIN32 #ifndef WIN32
#include <strings.h> #include <strings.h>
#endif #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 )
skipping to change at line 59 skipping to change at line 59
// 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>
#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>
#ifndef WORD_BIT
#define WORD_BIT 32
#endif
#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 #ifndef open
skipping to change at line 205 skipping to change at line 202
#endif #endif
extern int CondorErrno; extern int CondorErrno;
END_NAMESPACE // classad END_NAMESPACE // classad
char* strnewp( const char* ); char* strnewp( const char* );
#include "classad/classadErrno.h" #include "classad/classadErrno.h"
#endif//__COMMON_H__ #endif//__CLASSAD_COMMON_H__
 End of changes. 4 change blocks. 
6 lines changed or deleted 3 lines changed or added


 debug.h   debug.h 
skipping to change at line 33 skipping to change at line 33
#include "classad/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 const char *_except_file_name;
void _classad_except(char *format, ...); void _classad_except(const char *format, ...);
END_NAMESPACE END_NAMESPACE
#endif /* __CLASSAD_DEBUG_H */ #endif /* __CLASSAD_DEBUG_H__ */
 End of changes. 2 change blocks. 
2 lines changed or deleted 2 lines changed or added


 exprList.h   exprList.h 
skipping to change at line 20 skipping to change at line 20
* http://www.apache.org/licenses/LICENSE-2.0 * http://www.apache.org/licenses/LICENSE-2.0
* *
* Unless required by applicable law or agreed to in writing, software * Unless required by applicable law or agreed to in writing, software
* 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 __EXPR_LIST_H__ #ifndef __CLASSAD_EXPR_LIST_H__
#define __EXPR_LIST_H__ #define __CLASSAD_EXPR_LIST_H__
#include <vector> #include <vector>
BEGIN_NAMESPACE( classad ) BEGIN_NAMESPACE( classad )
class ExprListIterator; class ExprListIterator;
/// Represents a list of expressions, like {1, 2, 3} /// Represents a list of expressions, like {1, 2, 3}
class ExprList : public ExprTree class ExprList : public ExprTree
{ {
skipping to change at line 235 skipping to change at line 235
EvalState state; EvalState state;
std::vector<ExprTree*>::const_iterator itr; std::vector<ExprTree*>::const_iterator itr;
bool GetValue( Value& v, const ExprTree *tree, EvalState *es=NULL ); bool GetValue( Value& v, const ExprTree *tree, EvalState *es=NULL );
bool GetValue( Value& v, ExprTree*& t, const ExprTree *tree, EvalState *es=NULL ); bool GetValue( Value& v, ExprTree*& t, const ExprTree *tree, EvalState *es=NULL );
}; };
END_NAMESPACE // classad END_NAMESPACE // classad
#endif//__EXPR_LIST_H__ #endif//__CLASSAD_EXPR_LIST_H__
 End of changes. 2 change blocks. 
2 lines changed or deleted 2 lines changed or added


 exprTree.h   exprTree.h 
skipping to change at line 20 skipping to change at line 20
* http://www.apache.org/licenses/LICENSE-2.0 * http://www.apache.org/licenses/LICENSE-2.0
* *
* Unless required by applicable law or agreed to in writing, software * Unless required by applicable law or agreed to in writing, software
* 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 __EXPR_TREE_H__ #ifndef __CLASSAD_EXPR_TREE_H__
#define __EXPR_TREE_H__ #define __CLASSAD_EXPR_TREE_H__
#include "classad/classad_stl.h" #include "classad/classad_stl.h"
#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;
skipping to change at line 194 skipping to change at line 194
END_NAMESPACE // classad END_NAMESPACE // classad
#include "classad/literals.h" #include "classad/literals.h"
#include "classad/attrrefs.h" #include "classad/attrrefs.h"
#include "classad/operators.h" #include "classad/operators.h"
#include "classad/exprList.h" #include "classad/exprList.h"
#include "classad/classad.h" #include "classad/classad.h"
#include "classad/fnCall.h" #include "classad/fnCall.h"
#endif//__EXPR_TREE_H__ #endif//__CLASSAD_EXPR_TREE_H__
 End of changes. 2 change blocks. 
2 lines changed or deleted 2 lines changed or added


 fnCall.h   fnCall.h 
skipping to change at line 20 skipping to change at line 20
* http://www.apache.org/licenses/LICENSE-2.0 * http://www.apache.org/licenses/LICENSE-2.0
* *
* Unless required by applicable law or agreed to in writing, software * Unless required by applicable law or agreed to in writing, software
* 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 __FN_CALL_H__ #ifndef __CLASSAD_FN_CALL_H__
#define __FN_CALL_H__ #define __CLASSAD_FN_CALL_H__
#include <map> #include <map>
#include <vector> #include <vector>
#include "classad/classad.h" #include "classad/classad.h"
BEGIN_NAMESPACE( classad ) BEGIN_NAMESPACE( classad )
typedef std::vector<ExprTree*> ArgumentList; typedef std::vector<ExprTree*> ArgumentList;
typedef struct typedef struct
skipping to change at line 208 skipping to change at line 208
static bool interval( const char* name,const ArgumentList &argList,E valState &state,Value &result ); static bool interval( const char* name,const ArgumentList &argList,E valState &state,Value &result );
static bool eval( const char* name,const ArgumentList &argList,EvalS tate &state,Value &result ); static bool eval( const char* name,const ArgumentList &argList,EvalS tate &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//__CLASSAD_FN_CALL_H__
 End of changes. 2 change blocks. 
2 lines changed or deleted 2 lines changed or added


 indexfile.h   indexfile.h 
skipping to change at line 20 skipping to change at line 20
* http://www.apache.org/licenses/LICENSE-2.0 * http://www.apache.org/licenses/LICENSE-2.0
* *
* Unless required by applicable law or agreed to in writing, software * Unless required by applicable law or agreed to in writing, software
* 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_INDEXFILE_H__
#define __CLASSAD_INDEXFILE_H__
#include <fcntl.h> #include <fcntl.h>
#include <stdio.h> #include <stdio.h>
#include <string> #include <string>
#include <map> #include <map>
#include "classad/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{
skipping to change at line 68 skipping to change at line 71
int dump_index(); int dump_index();
private: private:
typedef classad_map<std::string,int> index_type; typedef classad_map<std::string,int> index_type;
typedef classad_map<std::string,int>::iterator index_itr_type; typedef classad_map<std::string,int>::iterator index_itr_type;
index_type Index; index_type Index;
index_itr_type index_itr; index_itr_type index_itr;
int filed; int filed;
}; };
END_NAMESPACE END_NAMESPACE
#endif //__CLASSAD_INDEXFILE_H__
 End of changes. 2 change blocks. 
0 lines changed or deleted 3 lines changed or added


 lexer.h   lexer.h 
skipping to change at line 20 skipping to change at line 20
* http://www.apache.org/licenses/LICENSE-2.0 * http://www.apache.org/licenses/LICENSE-2.0
* *
* Unless required by applicable law or agreed to in writing, software * Unless required by applicable law or agreed to in writing, software
* 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 __LEXER_H__ #ifndef __CLASSAD_LEXER_H__
#define __LEXER_H__ #define __CLASSAD_LEXER_H__
#include "classad/common.h" #include "classad/common.h"
#include "classad/value.h" #include "classad/value.h"
#include "classad/lexerSource.h" #include "classad/lexerSource.h"
BEGIN_NAMESPACE( classad ) BEGIN_NAMESPACE( classad )
// the lexical analyzer class // the lexical analyzer class
class Lexer class Lexer
{ {
skipping to change at line 205 skipping to change at line 205
void FinishedParse(); void FinishedParse();
// the 'extract token' functions // the 'extract token' functions
TokenType PeekToken( TokenValue* = 0 ); TokenType PeekToken( TokenValue* = 0 );
TokenType ConsumeToken( TokenValue* = 0 ); TokenType ConsumeToken( TokenValue* = 0 );
// internal buffer for token accumulation // internal buffer for token accumulation
std::string lexBuffer; // the buffer itselfw std::string lexBuffer; // the buffer itselfw
// miscellaneous functions // miscellaneous functions
static char *strLexToken (int); // s tring rep'n of token static const char *strLexToken (int); // string re p'n of token
// set debug flag // set debug flag
void SetDebug( bool d ) { debug = d; } void SetDebug( bool d ) { debug = d; }
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
skipping to change at line 252 skipping to change at line 252
// to tokenize the various tokens // to tokenize the various tokens
int tokenizeNumber (void); // integer o r real int tokenizeNumber (void); // integer o r real
int tokenizeAlphaHead (void); // identifie rs/reserved strings int tokenizeAlphaHead (void); // identifie rs/reserved strings
int tokenizePunctOperator(void);// punctuation a nd operators int tokenizePunctOperator(void);// punctuation a nd operators
int tokenizeString(char delim);//string constants int tokenizeString(char delim);//string constants
}; };
END_NAMESPACE // classad END_NAMESPACE // classad
#endif //__LEXER_H__ #endif //__CLASSAD_LEXER_H__
 End of changes. 3 change blocks. 
3 lines changed or deleted 3 lines changed or added


 lexerSource.h   lexerSource.h 
skipping to change at line 20 skipping to change at line 20
* http://www.apache.org/licenses/LICENSE-2.0 * http://www.apache.org/licenses/LICENSE-2.0
* *
* Unless required by applicable law or agreed to in writing, software * Unless required by applicable law or agreed to in writing, software
* 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 __LEXER_SOURCE_H__ #ifndef __CLASSAD_LEXER_SOURCE_H__
#define __LEXER_SOURCE_H__ #define __CLASSAD_LEXER_SOURCE_H__
#include "classad/common.h" #include "classad/common.h"
#include <iosfwd> #include <iosfwd>
BEGIN_NAMESPACE(classad) 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
skipping to change at line 158 skipping to change at line 158
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 &) : LexerSource() { return; } StringLexerSource(const StringLexerSource &) : LexerSource() { return; }
StringLexerSource &operator=(const StringLexerSource &) { return *this; } StringLexerSource &operator=(const StringLexerSource &) { return *this; }
}; };
END_NAMESPACE END_NAMESPACE
#endif /* __LEXER_SOURCE_H__ */ #endif /* __CLASSAD_LEXER_SOURCE_H__ */
 End of changes. 2 change blocks. 
2 lines changed or deleted 2 lines changed or added


 literals.h   literals.h 
skipping to change at line 20 skipping to change at line 20
* http://www.apache.org/licenses/LICENSE-2.0 * http://www.apache.org/licenses/LICENSE-2.0
* *
* Unless required by applicable law or agreed to in writing, software * Unless required by applicable law or agreed to in writing, software
* 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 __CLASSAD_LITERALS_H__
#define __LITERALS_H__ #define __CLASSAD_LITERALS_H__
#include <vector> #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.
*/ */
skipping to change at line 140 skipping to change at line 140
virtual bool _Evaluate (EvalState &, Value &) const; virtual bool _Evaluate (EvalState &, Value &) const;
virtual bool _Evaluate (EvalState &, Value &, ExprTree *&) c onst; virtual bool _Evaluate (EvalState &, Value &, ExprTree *&) c onst;
// literal specific information // literal specific information
Value value; Value value;
Value::NumberFactor factor; Value::NumberFactor factor;
}; };
END_NAMESPACE // classad END_NAMESPACE // classad
#endif//__LITERALS_H__ #endif//__CLASSAD_LITERALS_H__
 End of changes. 2 change blocks. 
2 lines changed or deleted 2 lines changed or added


 matchClassad.h   matchClassad.h 
skipping to change at line 20 skipping to change at line 20
* http://www.apache.org/licenses/LICENSE-2.0 * http://www.apache.org/licenses/LICENSE-2.0
* *
* Unless required by applicable law or agreed to in writing, software * Unless required by applicable law or agreed to in writing, software
* 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 __MATCH_CLASSAD_H__ #ifndef __CLASSAD_MATCH_CLASSAD_H__
#define __MATCH_CLASSAD_H__ #define __CLASSAD_MATCH_CLASSAD_H__
#include "classad/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 equivalent to the following, with some The top-level ClassAd equivalent to the following, with some
minor implementation differences for efficiency. Because of minor implementation differences for efficiency. Because of
the use of global-scope references to .LEFT and .RIGHT, this the use of global-scope references to .LEFT and .RIGHT, this
ad is not suitable for nesting inside of other ads. The use ad is not suitable for nesting inside of other ads. The use
 End of changes. 1 change blocks. 
2 lines changed or deleted 2 lines changed or added


 operators.h   operators.h 
skipping to change at line 20 skipping to change at line 20
* http://www.apache.org/licenses/LICENSE-2.0 * http://www.apache.org/licenses/LICENSE-2.0
* *
* Unless required by applicable law or agreed to in writing, software * Unless required by applicable law or agreed to in writing, software
* 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 __OPERATORS_H__ #ifndef __CLASSAD_OPERATORS_H__
#define __OPERATORS_H__ #define __CLASSAD_OPERATORS_H__
#include "classad/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
{ {
skipping to change at line 228 skipping to change at line 228
// operation specific information // operation specific information
OpKind operation; OpKind operation;
ExprTree *child1; ExprTree *child1;
ExprTree *child2; ExprTree *child2;
ExprTree *child3; ExprTree *child3;
}; };
END_NAMESPACE // classad END_NAMESPACE // classad
#endif//__OPERATORS_H__ #endif//__CLASSAD_OPERATORS_H__
 End of changes. 2 change blocks. 
2 lines changed or deleted 2 lines changed or added


 query.h   query.h 
skipping to change at line 20 skipping to change at line 20
* http://www.apache.org/licenses/LICENSE-2.0 * http://www.apache.org/licenses/LICENSE-2.0
* *
* Unless required by applicable law or agreed to in writing, software * Unless required by applicable law or agreed to in writing, software
* 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 __QUERY_H__ #ifndef __CLASSAD_QUERY_H__
#define __QUERY_H__ #define __CLASSAD_QUERY_H__
#include <vector> #include <vector>
#include <list> #include <list>
#include <string> #include <string>
BEGIN_NAMESPACE( classad ) BEGIN_NAMESPACE( classad )
class ClassAdCollection; class ClassAdCollection;
class ExprTree; class ExprTree;
class ClassAd; class ClassAd;
 End of changes. 1 change blocks. 
2 lines changed or deleted 2 lines changed or added


 sink.h   sink.h 
skipping to change at line 20 skipping to change at line 20
* http://www.apache.org/licenses/LICENSE-2.0 * http://www.apache.org/licenses/LICENSE-2.0
* *
* Unless required by applicable law or agreed to in writing, software * Unless required by applicable law or agreed to in writing, software
* 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 __SINK_H__ #ifndef __CLASSAD_SINK_H__
#define __SINK_H__ #define __CLASSAD_SINK_H__
#include "classad/common.h" #include "classad/common.h"
#include "classad/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
skipping to change at line 134 skipping to change at line 134
private: private:
int classadIndent; int classadIndent;
int listIndent; int listIndent;
bool wantStringQuotes; bool wantStringQuotes;
bool minimalParens; bool minimalParens;
int indentLevel; int indentLevel;
}; };
END_NAMESPACE // classad END_NAMESPACE // classad
#endif//__DUMPER_H__ #endif//__CLASSAD_SINK_H__
 End of changes. 2 change blocks. 
2 lines changed or deleted 2 lines changed or added


 source.h   source.h 
skipping to change at line 20 skipping to change at line 20
* http://www.apache.org/licenses/LICENSE-2.0 * http://www.apache.org/licenses/LICENSE-2.0
* *
* Unless required by applicable law or agreed to in writing, software * Unless required by applicable law or agreed to in writing, software
* 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 __SOURCE_H__ #ifndef __CLASSAD_SOURCE_H__
#define __SOURCE_H__ #define __CLASSAD_SOURCE_H__
#include <vector> #include <vector>
#include <iosfwd> #include <iosfwd>
#include "classad/lexer.h" #include "classad/lexer.h"
BEGIN_NAMESPACE( classad ) BEGIN_NAMESPACE( classad )
class ClassAd; class ClassAd;
class ExprTree; class ExprTree;
class ExprList; class ExprList;
skipping to change at line 150 skipping to change at line 150
std::vector<ExprTree*> &argList); std::vector<ExprTree*> &argList);
ExprTree *evaluateFunction(const std::string &functionName, ExprTree *evaluateFunction(const std::string &functionName,
std::vector<ExprTree*> &argList); std::vector<ExprTree*> &argList);
}; };
std::istream & operator>>(std::istream &stream, ClassAd &ad); std::istream & operator>>(std::istream &stream, ClassAd &ad);
END_NAMESPACE // classad END_NAMESPACE // classad
#endif//__SOURCE_H__ #endif//__CLASSAD_SOURCE_H__
 End of changes. 2 change blocks. 
2 lines changed or deleted 2 lines changed or added


 transaction.h   transaction.h 
skipping to change at line 20 skipping to change at line 20
* http://www.apache.org/licenses/LICENSE-2.0 * http://www.apache.org/licenses/LICENSE-2.0
* *
* Unless required by applicable law or agreed to in writing, software * Unless required by applicable law or agreed to in writing, software
* 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 __XACTION_H__ #ifndef __CLASSAD_TRANSACTION_H__
#define __XACTION_H__ #define __CLASSAD_TRANSACTION_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; class Sock;
BEGIN_NAMESPACE( classad ) BEGIN_NAMESPACE( classad )
skipping to change at line 106 skipping to change at line 106
enum { ACTIVE, PENDING }; enum { ACTIVE, PENDING };
private: private:
std::string xactionName, addr; std::string xactionName, addr;
int port; int port;
char state; char state;
}; };
END_NAMESPACE END_NAMESPACE
#endif /* __XACTION_H__ */ #endif /* __CLASSAD_TRANSACTION_H__ */
 End of changes. 2 change blocks. 
2 lines changed or deleted 2 lines changed or added


 util.h   util.h 
skipping to change at line 20 skipping to change at line 20
* http://www.apache.org/licenses/LICENSE-2.0 * http://www.apache.org/licenses/LICENSE-2.0
* *
* Unless required by applicable law or agreed to in writing, software * Unless required by applicable law or agreed to in writing, software
* 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 __UTILS_H__ #ifndef __CLASSAD_UTIL_H__
#define __UTILS_H__ #define __CLASSAD_UTIL_H__
#include "classad/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
skipping to change at line 70 skipping to change at line 70
void day_numbers(int year, int month, int day, int &weekday, int &yearday); void day_numbers(int year, int month, int day, int &weekday, int &yearday);
int fixed_from_gregorian(int year, int month, int day); int fixed_from_gregorian(int year, int month, int day);
bool is_leap_year(int year); bool is_leap_year(int year);
int classad_isinf(double x); int classad_isinf(double x);
int classad_isnan(double x); int classad_isnan(double x);
END_NAMESPACE // classad END_NAMESPACE // classad
#endif//__UTILS_H__ #endif//__CLASSAD_UTIL_H__
 End of changes. 2 change blocks. 
2 lines changed or deleted 2 lines changed or added


 value.h   value.h 
skipping to change at line 20 skipping to change at line 20
* http://www.apache.org/licenses/LICENSE-2.0 * http://www.apache.org/licenses/LICENSE-2.0
* *
* Unless required by applicable law or agreed to in writing, software * Unless required by applicable law or agreed to in writing, software
* 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 __VALUES_H__ #ifndef __CLASSAD_VALUE_H__
#define __VALUES_H__ #define __CLASSAD_VALUE_H__
#include "classad/common.h" #include "classad/common.h"
#include "classad/util.h" #include "classad/util.h"
BEGIN_NAMESPACE( classad ) BEGIN_NAMESPACE( classad )
class Literal; class Literal;
class ExprList; class ExprList;
class ClassAd; class ClassAd;
skipping to change at line 531 skipping to change at line 531
secs = (int) relTimeValueSecs; secs = (int) relTimeValueSecs;
return( valueType == RELATIVE_TIME_VALUE ); return( valueType == RELATIVE_TIME_VALUE );
} }
inline bool Value:: inline bool Value::
IsNumber( ) const IsNumber( ) const
{ {
return( valueType==INTEGER_VALUE || valueType==REAL_VALUE ); return( valueType==INTEGER_VALUE || valueType==REAL_VALUE );
} }
END_NAMESPACE // classad END_NAMESPACE // classad
#endif//__VALUES_H__ #endif//__CLASSAD_VALUE_H__
 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 20 skipping to change at line 20
* http://www.apache.org/licenses/LICENSE-2.0 * http://www.apache.org/licenses/LICENSE-2.0
* *
* Unless required by applicable law or agreed to in writing, software * Unless required by applicable law or agreed to in writing, software
* 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 __VIEW_H__ #ifndef __CLASSAD_VIEW_H__
#define __VIEW_H__ #define __CLASSAD_VIEW_H__
// STL includes // STL includes
#include <string> #include <string>
#include <set> #include <set>
#include "classad/classad_stl.h" #include "classad/classad_stl.h"
#include "classad/exprTree.h" #include "classad/exprTree.h"
#include "classad/matchClassad.h" #include "classad/matchClassad.h"
BEGIN_NAMESPACE( classad ) BEGIN_NAMESPACE( classad )
skipping to change at line 168 skipping to change at line 168
ViewMembers viewMembers; // the class ads in this view ViewMembers viewMembers; // the class ads in this view
MemberIndex memberIndex; // keys->Vie wMember mapping MemberIndex memberIndex; // keys->Vie wMember mapping
PartitionedViews partitionedViews; // views created by partitioning PartitionedViews partitionedViews; // views created by partitioning
SubordinateViews subordinateViews; // views explicitly added SubordinateViews subordinateViews; // views explicitly added
std::string oldAdSignature; // old signa ture of ad to be changed std::string oldAdSignature; // old signa ture of ad to be changed
MatchClassAd evalEnviron; // also stores view info MatchClassAd evalEnviron; // also stores view info
}; };
END_NAMESPACE END_NAMESPACE
#endif // VIEW_H #endif // __CLASSAD_VIEW_H__
 End of changes. 2 change blocks. 
2 lines changed or deleted 2 lines changed or added


 xmlLexer.h   xmlLexer.h 
skipping to change at line 20 skipping to change at line 20
* http://www.apache.org/licenses/LICENSE-2.0 * http://www.apache.org/licenses/LICENSE-2.0
* *
* Unless required by applicable law or agreed to in writing, software * Unless required by applicable law or agreed to in writing, software
* 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 __XMLLEXER_H__ #ifndef __CLASSAD_XMLLEXER_H__
#define __XMLLEXER_H__ #define __CLASSAD_XMLLEXER_H__
#include "classad/common.h" #include "classad/common.h"
#include "classad/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;
skipping to change at line 124 skipping to change at line 124
{ {
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_NAMESPACE // classad END_NAMESPACE // classad
#endif //__LEXER_H__ #endif //__CLASSAD_XMLLEXER_H__
 End of changes. 2 change blocks. 
2 lines changed or deleted 2 lines changed or added


 xmlSink.h   xmlSink.h 
skipping to change at line 20 skipping to change at line 20
* http://www.apache.org/licenses/LICENSE-2.0 * http://www.apache.org/licenses/LICENSE-2.0
* *
* Unless required by applicable law or agreed to in writing, software * Unless required by applicable law or agreed to in writing, software
* 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 __XMLSINK_H__ #ifndef __CLASSAD_XMLSINK_H__
#define __XMLSINK_H__ #define __CLASSAD_XMLSINK_H__
#include "classad/common.h" #include "classad/common.h"
#include "classad/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
skipping to change at line 70 skipping to change at line 70
int indent); int indent);
virtual void UnparseAux(std::string &buffer, std::vector<ExprTree*>& , virtual void UnparseAux(std::string &buffer, std::vector<ExprTree*>& ,
int indent); int indent);
bool compact_spacing; bool compact_spacing;
}; };
END_NAMESPACE // classad END_NAMESPACE // classad
#endif /*__XMLSINK_H__ */ #endif /*__CLASSAD_XMLSINK_H__ */
 End of changes. 2 change blocks. 
2 lines changed or deleted 2 lines changed or added


 xmlSource.h   xmlSource.h 
skipping to change at line 20 skipping to change at line 20
* http://www.apache.org/licenses/LICENSE-2.0 * http://www.apache.org/licenses/LICENSE-2.0
* *
* Unless required by applicable law or agreed to in writing, software * Unless required by applicable law or agreed to in writing, software
* 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 __XMLSOURCE_H__ #ifndef __CLASSAD_XMLSOURCE_H__
#define __XMLSOURCE_H__ #define __CLASSAD_XMLSOURCE_H__
#include "classad/xmlLexer.h" #include "classad/xmlLexer.h"
BEGIN_NAMESPACE( classad ) BEGIN_NAMESPACE( classad )
class ClassAd; class ClassAd;
class ClassAdXMLParser class ClassAdXMLParser
{ {
public: public:
skipping to change at line 67 skipping to change at line 67
ExprTree *ParseAbsTime(void); ExprTree *ParseAbsTime(void);
ExprTree *ParseRelTime(void); ExprTree *ParseRelTime(void);
ExprTree *ParseExpr(void); ExprTree *ParseExpr(void);
void SwallowEndTag(XMLLexer::TagID tag_id); void SwallowEndTag(XMLLexer::TagID tag_id);
XMLLexer lexer; XMLLexer lexer;
}; };
END_NAMESPACE END_NAMESPACE
#endif//__SOURCE_H__ #endif//__CLASSAD_XMLSOURCE_H__
 End of changes. 2 change blocks. 
2 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/