From 1756a54c74fe000fc3c644fcf888b1bef6bde2b5 Mon Sep 17 00:00:00 2001 From: smf- Date: Thu, 26 Jan 2017 12:35:10 +0000 Subject: fix for visual studio (nw) --- src/lib/netlist/plib/pfunction.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/lib/netlist/plib/pfunction.cpp') diff --git a/src/lib/netlist/plib/pfunction.cpp b/src/lib/netlist/plib/pfunction.cpp index 9c797800650..4736d047bbd 100644 --- a/src/lib/netlist/plib/pfunction.cpp +++ b/src/lib/netlist/plib/pfunction.cpp @@ -83,13 +83,13 @@ void pfunction::compile_postfix(const std::vector &inputs, static int get_prio(pstring v) { - if (v == "(" or v == ")") + if (v == "(" || v == ")") return 1; else if (v.left(v.begin()+1) >= "a" && v.left(v.begin()+1) <= "z") return 0; - else if (v == "*" or v == "/") + else if (v == "*" || v == "/") return 20; - else if (v == "+" or v == "-") + else if (v == "+" || v == "-") return 10; else if (v == "^") return 30; -- cgit v1.2.3-70-g09d2