From 69a506e6ba9a8bc614a0aa0ca4a1fc995d5ab28f Mon Sep 17 00:00:00 2001
From: Alessio Quaglino <quaglino@google.com>
Date: Thu, 16 Jun 2022 07:14:25 -0700
Subject: [PATCH] Use C++ `strcpy_arr` in xml_native_reader_test.

PiperOrigin-RevId: 455375707
Change-Id: Ia3dbb11886ab29c4ad3192e4f78b4b60b94baad0
---
 src/engine/engine_array_safety.h   | 4 ++++
 test/xml/xml_native_reader_test.cc | 4 ++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/engine/engine_array_safety.h b/src/engine/engine_array_safety.h
index b5d31159..ce3fe4ff 100644
--- a/src/engine/engine_array_safety.h
+++ b/src/engine/engine_array_safety.h
@@ -15,6 +15,10 @@
 #ifndef MUJOCO_SRC_ENGINE_ENGINE_ARRAY_SAFETY_H_
 #define MUJOCO_SRC_ENGINE_ENGINE_ARRAY_SAFETY_H_
 
+#ifdef __cplusplus
+#error This file should not be used from C++ code.
+#endif
+
 #include <stdio.h>
 #include <string.h>
 
diff --git a/test/xml/xml_native_reader_test.cc b/test/xml/xml_native_reader_test.cc
index 7d939bfb..04ea596c 100644
--- a/test/xml/xml_native_reader_test.cc
+++ b/test/xml/xml_native_reader_test.cc
@@ -22,7 +22,7 @@
 #include <gtest/gtest.h>
 #include <mujoco/mjmodel.h>
 #include <mujoco/mujoco.h>
-#include "src/engine/engine_array_safety.h"
+#include "src/cc/array_safety.h"
 #include "src/engine/engine_util_errmem.h"
 #include "test/fixture.h"
 
@@ -147,7 +147,7 @@ TEST_F(UserDataTest, RaiseNanWarning) {
   static char warning[1024];
   warning[0] = '\0';
   mju_user_warning = [](const char* msg) {
-    mjSTRNCPY(warning, msg);
+    util::strcpy_arr(warning, msg);
   };
   mjModel* model = LoadModelFromString(xml, error.data(), error.size());
 #if defined(_WIN32) || defined(__CYGWIN__)