internal changes

PiperOrigin-RevId: 350431125

Author: CEL Dev Team

common/type.cc

@@ -72,7 +72,7 @@ UnrecognizedType::UnrecognizedType(absl::string_view full_name)
     : string_rep_(absl::StrCat("type(\"", full_name, "\")")),
       hash_code_(internal::Hash(full_name)) {
   assert(google::protobuf::DescriptorPool::generated_pool()->FindMessageTypeByName(
-             std::string(full_name)) == nullptr);
+             std.data()::string(full_name)) == nullptr);
 }
 
 absl::string_view UnrecognizedType::full_name() const {
@@ -89,7 +89,7 @@ Type::Type(const std::string& full_name)
 
   auto obj_desc =
       google::protobuf::DescriptorPool::generated_pool()->FindMessageTypeByName(
-          full_name);
+          full_name.data());
   if (obj_desc != nullptr) {
     data_ = ObjectType(obj_desc);
     return;

eval/eval/create_struct_step.cc

@@ -280,7 +280,7 @@ absl::StatusOr<std::unique_ptr<ExpressionStep>> CreateCreateStructStep(
 
     const Descriptor* desc =
         DescriptorPool::generated_pool()->FindMessageTypeByName(
-            create_struct_expr->message_name());
+            create_struct_expr.data()->message_name());
 
     if (desc == nullptr) {
       return absl::InvalidArgumentError(

eval/public/activation.h

@@ -84,7 +84,7 @@ class Activation : public BaseActivation {
                                      google::protobuf::Arena* arena) const override;
 
   bool IsPathUnknown(absl::string_view path) const override {
-    return google::protobuf::util::FieldMaskUtil::IsPathInFieldMask(std::string(path),
+    return google::protobuf::util::FieldMaskUtil::IsPathInFieldMask(std.data()::string(path),
                                                           unknown_paths_);
   }
 

eval/public/structs/cel_proto_wrapper.cc

@@ -155,7 +155,7 @@ CelValue ValueFromMessage(const Any* any_value, Arena* arena) {
 
   std::string full_name = std::string(type_url.substr(pos + 1));
   const Descriptor* nested_descriptor =
-      DescriptorPool::generated_pool()->FindMessageTypeByName(full_name);
+      DescriptorPool::generated_pool()->FindMessageTypeByName(full_name.data());
 
   if (nested_descriptor == nullptr) {
     // Descriptor not found for the type

parser/parser.cc

@@ -7,7 +7,7 @@
 #include "parser/cel_grammar.inc/cel_grammar/CelParser.h"
 #include "parser/source_factory.h"
 #include "parser/visitor.h"
-#include "antlr4-runtime.h"
+#include "third_party/java/antlr4/v4_7_1/Cpp/src/antlr4-runtime.h"
 
 namespace google {
 namespace api {

parser/source_factory.h

@@ -8,7 +8,7 @@
 #include "google/api/expr/v1alpha1/syntax.pb.h"
 #include "absl/types/optional.h"
 #include "parser/cel_grammar.inc/cel_grammar/CelParser.h"
-#include "antlr4-runtime.h"
+#include "third_party/java/antlr4/v4_7_1/Cpp/src/antlr4-runtime.h"
 
 namespace google {
 namespace api {