diff options
author | 2017-01-26 12:35:10 +0000 | |
---|---|---|
committer | 2017-01-26 12:35:48 +0000 | |
commit | 1756a54c74fe000fc3c644fcf888b1bef6bde2b5 (patch) | |
tree | eb8fa2b4843531cf1fd002ab11ced5418b833a66 /src/lib/netlist/plib/pfunction.cpp | |
parent | 716361fd6a96b702575bcabd2fc5a7b78e2f6e33 (diff) |
fix for visual studio (nw)
Diffstat (limited to 'src/lib/netlist/plib/pfunction.cpp')
-rw-r--r-- | src/lib/netlist/plib/pfunction.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
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<pstring> &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; |