Merge branch 'develop'

This commit is contained in:
jzmaddock
2015-02-14 18:00:52 +00:00
2 changed files with 2 additions and 2 deletions

View File

@@ -22,7 +22,7 @@ struct has {
};
// MSVC can not generate neither default constructor, nor assignment operator,
// nor copy constructor for `has2` type. Supressing those warnings is essential,
// nor copy constructor for `has2` type. Suppressing those warnings is essential,
// because we treat warnings as errors in those tests
#if (defined _MSC_VER)
# pragma warning( push )

View File

@@ -20,7 +20,7 @@ struct has {
};
// MSVC can not generate neither default constructor, nor assignment operator,
// nor copy constructor for `has2` type. Supressing those warnings is essential,
// nor copy constructor for `has2` type. Suppressing those warnings is essential,
// because we treat warnings as errors in those tests
#if (defined _MSC_VER)
# pragma warning( push )