diff options
| author | Dan Goodliffe <dan@randomdan.homeip.net> | 2020-12-19 15:50:35 +0000 | 
|---|---|---|
| committer | Dan Goodliffe <dan@randomdan.homeip.net> | 2020-12-19 15:51:24 +0000 | 
| commit | 7e19f6699c04a3b4e3a20ba2636627eb9354d5ef (patch) | |
| tree | 7f6e54288d34bbd675da647c4668fd74239fde00 | |
| parent | Fix util.h includes (diff) | |
| download | icespider-7e19f6699c04a3b4e3a20ba2636627eb9354d5ef.tar.bz2 icespider-7e19f6699c04a3b4e3a20ba2636627eb9354d5ef.tar.xz icespider-7e19f6699c04a3b4e3a20ba2636627eb9354d5ef.zip  | |
Disable misc-no-recursion on Slice search functions
| -rw-r--r-- | icespider/compile/routeCompiler.cpp | 12 | 
1 files changed, 6 insertions, 6 deletions
diff --git a/icespider/compile/routeCompiler.cpp b/icespider/compile/routeCompiler.cpp index 8b357ba..7f5ddd6 100644 --- a/icespider/compile/routeCompiler.cpp +++ b/icespider/compile/routeCompiler.cpp @@ -35,20 +35,19 @@ namespace IceSpider {  		}  		Slice::OperationPtr +		// NOLINTNEXTLINE(misc-no-recursion)  		RouteCompiler::findOperation(const std::string & on, const Slice::ContainerPtr & c, const Ice::StringSeq & ns)  		{  			for (const auto & cls : c->classes()) {  				auto fqcn = ns + cls->name();  				for (const auto & op : cls->allOperations()) { -					auto fqon = boost::algorithm::join(fqcn + op->name(), "."); -					if (fqon == on) { +					if (boost::algorithm::join(fqcn + op->name(), ".") == on) {  						return op;  					}  				}  			}  			for (const auto & m : c->modules()) { -				auto op = findOperation(on, m, ns + m->name()); -				if (op) { +				if (auto op = findOperation(on, m, ns + m->name())) {  					return op;  				}  			} @@ -56,11 +55,11 @@ namespace IceSpider {  		}  		Slice::OperationPtr +		// NOLINTNEXTLINE(misc-no-recursion)  		RouteCompiler::findOperation(const std::string & on, const Units & us)  		{  			for (const auto & u : us) { -				auto op = findOperation(on, u.second); -				if (op) { +				if (auto op = findOperation(on, u.second)) {  					return op;  				}  			} @@ -68,6 +67,7 @@ namespace IceSpider {  		}  		std::optional<RouteCompiler::Type> +		// NOLINTNEXTLINE(misc-no-recursion)  		RouteCompiler::findType(const std::string & tn, const Slice::ContainerPtr & c, const Ice::StringSeq & ns)  		{  			for (const auto & strct : c->structs()) {  | 
