Upgrade lanes from qgit2.3

[tortoisegit/TortoiseGitJp.git] / src / TortoiseProc / lanes.h

diff --git a/src/TortoiseProc/lanes.h b/src/TortoiseProc/lanes.h
index 68f06d4..6626aeb 100644 (file)
--- a/src/TortoiseProc/lanes.h
+++ b/src/TortoiseProc/lanes.h
@@ -59,6 +59,8 @@ public:
                                                x == BOUNDARY_R || x == BOUNDARY_L); }
        static inline bool isMerge(int x) { return (x == MERGE_FORK || x == MERGE_FORK_R ||
                                             x == MERGE_FORK_L || isBoundary(x)); }
+       static inline bool isActive(int x) { return (x == ACTIVE || x == INITIAL || x == BRANCH ||
+                                             isMerge(x)); }
 
        Lanes() {} // init() will setup us later, when data is available
        bool isEmpty() { return typeVec.empty(); }