From 65ce7b7c298d64bacd7d0231039747c55d1d2f05 Mon Sep 17 00:00:00 2001 From: Marcus Minhorst Date: Mon, 16 Jun 2025 16:13:41 -0400 Subject: [PATCH] Fixed conflicting import under solaris --- src/common/engine/serializer.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/common/engine/serializer.cpp b/src/common/engine/serializer.cpp index 97ded1adf..73e3edf88 100644 --- a/src/common/engine/serializer.cpp +++ b/src/common/engine/serializer.cpp @@ -1052,6 +1052,7 @@ FSerializer &Serialize(FSerializer &arc, const char *key, uint32_t &value, uint3 // //========================================================================== +#if !defined(__sun) || !defined(__sun__) FSerializer& Serialize(FSerializer& arc, const char* key, char& value, char* defval) { int32_t vv = value; @@ -1060,6 +1061,7 @@ FSerializer& Serialize(FSerializer& arc, const char* key, char& value, char* def value = (int8_t)vv; return arc; } +#endif FSerializer &Serialize(FSerializer &arc, const char *key, int8_t &value, int8_t *defval) {