summaryrefslogtreecommitdiff
path: root/file_hierarchy.h
diff options
context:
space:
mode:
Diffstat (limited to 'file_hierarchy.h')
-rw-r--r--file_hierarchy.h3
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 ),
bgstack15