diff options
| author | Daniel Wilhelm <daniel@wili.li> | 2014-04-18 17:22:36 +0200 |
|---|---|---|
| committer | Daniel Wilhelm <daniel@wili.li> | 2014-04-18 17:22:36 +0200 |
| commit | ecb1524f8da7901338b263384fed3c612f117b4c (patch) | |
| tree | e7e06423fe27ea5ab45f27fc4b39ae597ba72490 /file_hierarchy.h | |
| parent | 5.10 (diff) | |
| download | FreeFileSync-ecb1524f8da7901338b263384fed3c612f117b4c.tar.gz FreeFileSync-ecb1524f8da7901338b263384fed3c612f117b4c.tar.bz2 FreeFileSync-ecb1524f8da7901338b263384fed3c612f117b4c.zip | |
5.11
Diffstat (limited to 'file_hierarchy.h')
| -rw-r--r-- | file_hierarchy.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/file_hierarchy.h b/file_hierarchy.h index 18f46ea3..8f4b1afb 100644 --- a/file_hierarchy.h +++ b/file_hierarchy.h @@ -230,11 +230,12 @@ public: CompareVariant cmpVar, size_t fileTimeTolerance) : #ifdef _MSC_VER +#pragma warning(push) #pragma warning(disable : 4355) //"The this pointer is valid only within nonstatic member functions. It cannot be used in the initializer list for a base class." #endif HierarchyObject(Zstring(), *this), #ifdef _MSC_VER -#pragma warning(default : 4355) +#pragma warning(pop) #endif filter_(filter), cmpVar_(cmpVar), fileTimeTolerance_(fileTimeTolerance), baseDirPfL (dirPostfixedLeft ), |