Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Sharybin <sergey.vfx@gmail.com>2020-06-18 14:23:12 +0300
committerSergey Sharybin <sergey.vfx@gmail.com>2020-06-19 13:02:21 +0300
commit8c3dd6d83df467f3b8e53b6c97545eabf07768be (patch)
tree1ec635e9cea07b23f0774d2ababa5c0a4ffbce57 /extern/gtest/src/gtest-all.cc
parent0f78a579047ec8946021ca58b8ee48f7486e6605 (diff)
Upgrade Google libraries
Upgrades Glog from 0.3.5 to 0.4.0, and Gtest from 0.8.0 to 0.10.0. Hopefully this will solve compilation error on MSVC with C++17.
Diffstat (limited to 'extern/gtest/src/gtest-all.cc')
-rw-r--r--extern/gtest/src/gtest-all.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/extern/gtest/src/gtest-all.cc b/extern/gtest/src/gtest-all.cc
index 0a9cee52233..ad292905cf3 100644
--- a/extern/gtest/src/gtest-all.cc
+++ b/extern/gtest/src/gtest-all.cc
@@ -26,10 +26,9 @@
// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
//
-// Author: mheule@google.com (Markus Heule)
-//
-// Google C++ Testing Framework (Google Test)
+// Google C++ Testing and Mocking Framework (Google Test)
//
// Sometimes it's desirable to build Google Test by compiling a single file.
// This file serves this purpose.
@@ -42,6 +41,7 @@
#include "src/gtest.cc"
#include "src/gtest-death-test.cc"
#include "src/gtest-filepath.cc"
+#include "src/gtest-matchers.cc"
#include "src/gtest-port.cc"
#include "src/gtest-printers.cc"
#include "src/gtest-test-part.cc"