From 25df513a77819d275cc5d98d2a1d5100f3c0c037 Mon Sep 17 00:00:00 2001 From: Patrick Shriwise Date: Thu, 12 Sep 2019 09:29:12 -0500 Subject: [PATCH] Renaming function. --- include/openmc/cell.h | 2 +- src/cell.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/include/openmc/cell.h b/include/openmc/cell.h index 90c03e3a90..2cd98ada1a 100644 --- a/include/openmc/cell.h +++ b/include/openmc/cell.h @@ -214,7 +214,7 @@ protected: static BoundingBox bounding_box_complex(std::vector rpn); static void apply_demorgan(std::vector::iterator start, std::vector::iterator stop); - static void remove_complements(std::vector& rpn); + static void remove_complement_ops(std::vector& rpn); static std::vector::iterator find_left_parenthesis(std::vector::iterator start, const std::vector& rpn); diff --git a/src/cell.cpp b/src/cell.cpp index f560698aa2..7ad48bd326 100644 --- a/src/cell.cpp +++ b/src/cell.cpp @@ -642,7 +642,7 @@ CSGCell::find_left_parenthesis(std::vector::iterator start, return it; } -void CSGCell::remove_complements(std::vector& rpn) { +void CSGCell::remove_complement_ops(std::vector& rpn) { auto it = std::find(rpn.begin(), rpn.end(), OP_COMPLEMENT); while (it != rpn.end()) { // find the opening parenthesis (if any) @@ -659,7 +659,7 @@ void CSGCell::remove_complements(std::vector& rpn) { BoundingBox CSGCell::bounding_box_complex(std::vector rpn) { // remove complements by adjusting surface signs and operators - remove_complements(rpn); + remove_complement_ops(rpn); // use the first token to set the bounding box auto it = rpn.begin();