diff options
| author | Brad King <brad.king@kitware.com> | 2019-11-13 14:48:23 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2019-11-13 14:48:23 (GMT) |
| commit | dc01c73f2d187d3a7e20527372f4e2888ffedc0a (patch) | |
| tree | 4b3f5b18bbd70f2d9d51c13525d0ccd26924aac1 /Source/kwsys/RegularExpression.hxx.in | |
| parent | 011693867ac0ee81912cca8e2289b9c584ccfb9b (diff) | |
| parent | 78ce959a40c788356e304829d5f93742c5c83fa6 (diff) | |
| download | CMake-dc01c73f2d187d3a7e20527372f4e2888ffedc0a.zip CMake-dc01c73f2d187d3a7e20527372f4e2888ffedc0a.tar.gz CMake-dc01c73f2d187d3a7e20527372f4e2888ffedc0a.tar.bz2 | |
Merge branch 'upstream-KWSys' into update-kwsys
# By KWSys Upstream
* upstream-KWSys:
KWSys 2019-11-13 (e67ed8ef)
Diffstat (limited to 'Source/kwsys/RegularExpression.hxx.in')
| -rw-r--r-- | Source/kwsys/RegularExpression.hxx.in | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/Source/kwsys/RegularExpression.hxx.in b/Source/kwsys/RegularExpression.hxx.in index 0c2366b..d11db88 100644 --- a/Source/kwsys/RegularExpression.hxx.in +++ b/Source/kwsys/RegularExpression.hxx.in @@ -66,6 +66,13 @@ private: const char* searchstring; }; +#ifdef _MSC_VER +# pragma warning(push) +# if _MSC_VER < 1900 +# pragma warning(disable : 4351) /* new behavior */ +# endif +#endif + /** * \brief Creates an invalid match object */ @@ -76,6 +83,10 @@ inline RegularExpressionMatch::RegularExpressionMatch() { } +#ifdef _MSC_VER +# pragma warning(pop) +#endif + /** * \brief Returns true if the match pointers are valid */ |