diff options
| author | kh1 <karsten.heimrich@nokia.com> | 2012-08-21 12:05:11 +0200 |
|---|---|---|
| committer | Karsten Heimrich <karsten.heimrich@nokia.com> | 2012-08-22 09:59:49 +0200 |
| commit | 27c1445c9f82434a39ada4c5fbf188d1ab09e5ba (patch) | |
| tree | 594d1c024ab8fc9a595e4ec5f8625b9222672563 /src/libs/7zip/win/CPP/Common/Wildcard.h | |
| parent | b22a0e8e6d1b3114fc37acad7e96b6b3564a8e19 (diff) | |
Revert "Fixes required for errorless MinGW-w64 compilation are done."
This reverts commit 9cad5d54cf0d78e92b4ee831299d83b657f42f2e as it
breaks compressing the meta folder (Windows 7, VS 2010).
Change-Id: I24d4ec37941487fc3cc998706d33cd5d8b9f011a
Reviewed-by: Tim Jenssen <tim.jenssen@nokia.com>
Diffstat (limited to 'src/libs/7zip/win/CPP/Common/Wildcard.h')
| -rw-r--r-- | src/libs/7zip/win/CPP/Common/Wildcard.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libs/7zip/win/CPP/Common/Wildcard.h b/src/libs/7zip/win/CPP/Common/Wildcard.h index 859f567ea..6d4cbcece 100644 --- a/src/libs/7zip/win/CPP/Common/Wildcard.h +++ b/src/libs/7zip/win/CPP/Common/Wildcard.h @@ -32,8 +32,8 @@ class CCensorNode void AddItemSimple(bool include, CItem &item); bool CheckPath(UStringVector &pathParts, bool isFile, bool &include) const; public: - CCensorNode(): Parent(0) { } - CCensorNode(const UString &name, CCensorNode *parent): Parent(parent), Name(name) { } // PQR for MinGW-w64: Initialization order. + CCensorNode(): Parent(0) { }; + CCensorNode(const UString &name, CCensorNode *parent): Name(name), Parent(parent) { }; UString Name; CObjectVector<CCensorNode> SubNodes; CObjectVector<CItem> IncludeItems; |