From 17ae349ce6f1d9953c1ba7415ced57cb4bfff38d Mon Sep 17 00:00:00 2001 From: couriersud Date: Tue, 8 Oct 2019 00:32:25 +0200 Subject: [PATCH] netlist: fix error on compilers having issues with std::pair. (nw) --- src/lib/netlist/solver/nld_ms_gcr.h | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/src/lib/netlist/solver/nld_ms_gcr.h b/src/lib/netlist/solver/nld_ms_gcr.h index 0258c768e09..20ff2314afe 100644 --- a/src/lib/netlist/solver/nld_ms_gcr.h +++ b/src/lib/netlist/solver/nld_ms_gcr.h @@ -283,12 +283,8 @@ namespace devices strm.writeline("{\n"); csc_private(strm); strm.writeline("}\n"); - // mingw 5.3 workaround -#if !defined(_WIN32) && !defined(_WIN64) - return std::pair(name, t.str()); -#else + // some compilers (_WIN32, _WIN64, mac osx) need an explicit cast return std::pair(name, pstring(t.str())); -#endif } template