node.h.diffs

来自「it is very important」· DIFFS 代码 · 共 47 行

*** node.h~	Mon Oct 30 14:02:16 2000
--- node.h	Mon Oct 30 12:09:50 2000
***************
*** 59,64 ****
--- 59,72 ----
  #include "energy-model.h"
  #include "location.h"
  
+ #ifdef USE_NIXNODES
+ // This hack prevents the hash-map stl includes from coming in for
+ // every cc program that calls node.h...it causes compilation errors
+ // for a number of other's
+ // Addition for NixVector Routing
+ #include "nixnode.h"
+ #endif
+ 
  class LinkHead;
  
  LIST_HEAD(linklist_head, LinkHead); // declare list head structure 
***************
*** 128,134 ****
  	inline const struct linklist_head& linklisthead() const { 
  		return linklisthead_; 
  	}
- 	
  	static Node* get_node_by_address(nsaddr_t);
  
  protected:
--- 136,141 ----
***************
*** 146,151 ****
--- 153,166 ----
  	struct if_head ifhead_; // list of phys for this node
  	struct linklist_head linklisthead_; // list of link heads on node
  
+  	// Additions for Nix Routing
+ #ifdef 	USE_NIXNODES
+ 	NixNode* nixnode_;
+ #else
+ 	void*    nixnode_;
+ #endif
+ 	// End of Additions for Nix Routing
+ 
  public:
  	// XXX Energy related stuff. Should be moved later to a wireless 
  	// routing plugin module instead of sitting here.