OSS export.

PiperOrigin-RevId: 348051353

Author: kyessenov

eval/eval/evaluator_core.h

@@ -34,6 +34,8 @@ namespace runtime {
 // Forward declaration of ExecutionFrame, to resolve circular dependency.
 class ExecutionFrame;
 
+using Expr = google::api::expr::v1alpha1::Expr;
+
 // Class Expression represents single execution step.
 class ExpressionStep {
  public:

eval/public/builtin_func_test.cc

@@ -737,7 +737,7 @@ TEST_F(BuiltinsTest, TestDoubleConversions_uint) {
 }
 
 TEST_F(BuiltinsTest, TestDoubleConversionError_stringInvalid) {
-  string invalid = "-100e-10.0";
+  std::string invalid = "-100e-10.0";
   TestTypeConversionError(builtin::kDouble, CelValue::CreateString(&invalid));
 }
 
@@ -822,7 +822,7 @@ TEST_F(BuiltinsTest, TestUintConversionError_intRange) {
 }
 
 TEST_F(BuiltinsTest, TestUintConversionError_stringInvalid) {
-  string invalid = "-100";
+  std::string invalid = "-100";
   TestTypeConversionError(builtin::kUint, CelValue::CreateString(&invalid));
 }