From 656575b59d4f0d67452cca7409c9064f690f038c Mon Sep 17 00:00:00 2001 From: kwolekr Date: Thu, 7 May 2015 02:34:15 -0400 Subject: NodeResolver: Remove NodeResolveMethod This simplifies NodeResolver logic and makes some interfaces cleaner. --- src/nodedef.h | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) (limited to 'src/nodedef.h') diff --git a/src/nodedef.h b/src/nodedef.h index 42b345059..efd7f0923 100644 --- a/src/nodedef.h +++ b/src/nodedef.h @@ -282,12 +282,6 @@ struct ContentFeatures } }; -enum NodeResolveMethod { - NODE_RESOLVE_NONE, - NODE_RESOLVE_DIRECT, - NODE_RESOLVE_DEFERRED, -}; - class INodeDefManager { public: INodeDefManager(){} @@ -306,7 +300,7 @@ public: virtual bool getNodeRegistrationStatus() const=0; - virtual void pendNodeResolve(NodeResolver *nr, NodeResolveMethod how)=0; + virtual void pendNodeResolve(NodeResolver *nr)=0; virtual bool cancelNodeResolveCallback(NodeResolver *nr)=0; }; @@ -353,7 +347,7 @@ public: virtual bool getNodeRegistrationStatus() const=0; virtual void setNodeRegistrationStatus(bool completed)=0; - virtual void pendNodeResolve(NodeResolver *nr, NodeResolveMethod how)=0; + virtual void pendNodeResolve(NodeResolver *nr)=0; virtual bool cancelNodeResolveCallback(NodeResolver *nr)=0; virtual void runNodeResolveCallbacks()=0; virtual void resetNodeResolveState()=0; @@ -371,7 +365,6 @@ public: const std::string &node_alt, content_t c_fallback); bool getIdsFromNrBacklog(std::vector *result_out, bool all_required=false, content_t c_fallback=CONTENT_IGNORE); - const std::string &getNodeName(content_t c) const; void nodeResolveInternal(); -- cgit v1.2.3