From 60a24c28e9bf23ee022968f54ae35784acf28d13 Mon Sep 17 00:00:00 2001
From: David Rohr <drohr@jwdt.org>
Date: Mon, 14 Mar 2022 15:33:23 +0100
Subject: [PATCH] Revert "Revert "Workaround: temporarily support multiple
 ms_gsl versions""

This reverts commit ce9e90428732374fd966005011598e667ab13e27.
---
 Framework/Core/include/Framework/TMessageSerializer.h | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/Framework/Core/include/Framework/TMessageSerializer.h b/Framework/Core/include/Framework/TMessageSerializer.h
index aca0ef9caa67e..d003a277c64e7 100644
--- a/Framework/Core/include/Framework/TMessageSerializer.h
+++ b/Framework/Core/include/Framework/TMessageSerializer.h
@@ -19,9 +19,13 @@
 #include <TMessage.h>
 #include <TObjArray.h>
 #include <TStreamerInfo.h>
-#include <gsl/util>
 #include <gsl/span>
+#if __has_include(<gsl/util>)
+#include <gsl/util>
 #include <gsl/narrow>
+#else
+#include <gsl/gsl_util>
+#endif
 #include <memory>
 #include <mutex>
 #include <cstddef>