From b320c441ab5ad04ea4a6766d0a178fc7c0ea4105 Mon Sep 17 00:00:00 2001
From: marha <marha@users.sourceforge.net>
Date: Sun, 31 Oct 2010 19:30:18 +0000
Subject: Make sure implicit rule searching is taking the extra dependencies
 into account

---
 tools/mhmake/src/rule.h | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

(limited to 'tools/mhmake/src/rule.h')

diff --git a/tools/mhmake/src/rule.h b/tools/mhmake/src/rule.h
index 3b288e3d2..7cc287600 100644
--- a/tools/mhmake/src/rule.h
+++ b/tools/mhmake/src/rule.h
@@ -74,13 +74,16 @@ public:
   void SetTargetsIsBuilding(const fileinfo *pSrc);
 };
 
+typedef vector<pair<vector<fileinfo*>,refptr<rule> > > implicitruledep_t;
+typedef pair<fileinfo *, implicitruledep_t > implicitrule_t;
+
 class IMPLICITRULE
 {
   static set<rule*> m_ImplicitRuleRecurseDetStack;
-  static vector<pair<fileinfo *, vector<pair< fileinfo *,refptr<rule> > > > > m_ImplicitRules;  // Use a vector and not a map because the order of the implicit rules is important
+  static vector<implicitrule_t> m_ImplicitRules;  // Use a vector and not a map because the order of the implicit rules is important
 public:
-  static void AddImplicitRule(fileinfo *pTarget,const vector<fileinfo*> &Deps,refptr<rule> pRule);
-  static void SearchImplicitRule(const fileinfo *pTarget,vector< pair<fileinfo*,refptr<rule> > >&Result);
+  static void AddImplicitRule(fileinfo *pTarget,const vector<fileinfo*> &Deps, refptr<rule> pRule);
+  static void SearchImplicitRule(const fileinfo *pTarget, implicitruledep_t &Result);
   static void PrintImplicitRules();
   static bool PushRule(rule *pRule)
   {
-- 
cgit v1.2.3