[Oval-commits] r64 - trunk/Interpreters/src

[Pavel Vinogradov]

Author: blaze-guest
Date: 2007-07-10 14:11:41 +0000 (Tue, 10 Jul 2007)
New Revision: 64

Modified:
   trunk/Interpreters/src/ExternalVariable.h
   trunk/Interpreters/src/FilterEntity.h
Log:
5.3 merge updates

Modified: trunk/Interpreters/src/ExternalVariable.h
===================================================================
--- trunk/Interpreters/src/ExternalVariable.h	2007-07-10 10:11:38 UTC (rev 63)
+++ trunk/Interpreters/src/ExternalVariable.h	2007-07-10 14:11:41 UTC (rev 64)
@@ -1,5 +1,5 @@
 //
-// $Id: ExternalVariable.h,v 1.5 2007/01/09 17:43:01 bakerj Exp $
+// $Id: ExternalVariable.h 4137 2007-06-22 14:12:09Z bakerj $
 //
 //****************************************************************************************//
 // Copyright (c) 2002-2007, The MITRE Corporation
@@ -45,7 +45,7 @@
 class ExternalVariable : public AbsVariable {
 public:
 
-	ExternalVariable(string id = "", string name = "external_variable", int version = 1, OvalEnum::Datatype datatype = OvalEnum::STRING_TYPE, StringVector* msgs = new StringVector());
+	ExternalVariable(string id = "", string name = "external_variable", int version = 1, OvalEnum::Datatype datatype = OvalEnum::DATATYPE_STRING, StringVector* msgs = new StringVector());
 	~ExternalVariable();
 
 	void Parse(DOMElement* externalVariableElm);

Modified: trunk/Interpreters/src/FilterEntity.h
===================================================================
--- trunk/Interpreters/src/FilterEntity.h	2007-07-10 10:11:38 UTC (rev 63)
+++ trunk/Interpreters/src/FilterEntity.h	2007-07-10 14:11:41 UTC (rev 64)
@@ -1,5 +1,5 @@
 //
-// $Id: FilterEntity.h,v 1.9 2007/01/09 17:43:01 bakerj Exp $
+// $Id: FilterEntity.h 4123 2007-06-22 14:03:41Z bakerj $
 //
 //****************************************************************************************//
 // Copyright (c) 2002-2007, The MITRE Corporation
@@ -51,7 +51,7 @@
 		@param orig a StateEntity* to be copied
 	*/
 	FilterEntity(FilterEntity* orig);
-	FilterEntity(string name = "", string value = "", OvalEnum::Datatype datatype = OvalEnum::STRING_TYPE, OvalEnum::Operation operation = OvalEnum::EQUALS_OPERATION, AbsVariable* varRef = NULL, OvalEnum::Check entityCheck = OvalEnum::ALL_CHECK, OvalEnum::Check varCheck = OvalEnum::ALL_CHECK, bool nil = false);
+	FilterEntity(string name = "", string value = "", OvalEnum::Datatype datatype = OvalEnum::DATATYPE_STRING, OvalEnum::Operation operation = OvalEnum::OPERATION_EQUALS, AbsVariable* varRef = NULL, OvalEnum::Check entityCheck = OvalEnum::CHECK_ALL, OvalEnum::Check varCheck = OvalEnum::CHECK_ALL, bool nil = false);
 	~FilterEntity();
 
 	bool Equals(AbsEntity* entity);