From 32db7a9533ee53635fc801340dfb48cd238f2145 Mon Sep 17 00:00:00 2001
From: Caio Oliveira <caio.oliveira@intel.com>
Date: Fri, 23 Feb 2024 15:52:58 -0800
Subject: [PATCH] intel/elk: Use anonymous namespace in fs_combine_constants

Certain GitLab CI build use a combination of LTO and -Werror=odr that
will fail if both ELK and BRW share the same names for those helpers,
so wrap the ELK ones around anonymous namespace.

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/27563>
---
 src/intel/compiler/elk/elk_fs_combine_constants.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/intel/compiler/elk/elk_fs_combine_constants.cpp b/src/intel/compiler/elk/elk_fs_combine_constants.cpp
index b455989cbb7..5c639c2a52f 100644
--- a/src/intel/compiler/elk/elk_fs_combine_constants.cpp
+++ b/src/intel/compiler/elk/elk_fs_combine_constants.cpp
@@ -43,6 +43,8 @@ using namespace elk;
 
 static const bool debug = false;
 
+namespace {
+
 enum PACKED interpreted_type {
    float_only = 0,
    integer_only,
@@ -1304,6 +1306,8 @@ parcel_out_registers(struct imm *imm, unsigned len, const elk_bblock_t *cur_bloc
    }
 }
 
+} /* namespace */
+
 bool
 elk_fs_visitor::opt_combine_constants()
 {