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-12 16:15:09 +0300
committerSergey Sharybin <sergey.vfx@gmail.com>2020-06-12 16:17:17 +0300
commitf8696742bb2a727886ab3c492eb0a8c7afba53bb (patch)
tree5ac0289e4c174df6915bf786fb7c51973c60b15c
parentfd14d1ccebd4dd8a04561cae16cd0e3e778b4377 (diff)
Fix/workaround compilation error on devtoolset-6
Smells like GCC bug [1], which is backed up by the fact that locally GCC-10 and CLang-10 works fine. Since the change is trivial (and, arguably, correct since there is no real difference between tests code and actual code) seems fine to fix. Fix suggested by Jacques Lucke, thanks! [1] https://gcc.gnu.org/bugzilla/show_bug.cgi?id=56480
-rw-r--r--tests/gtests/blenlib/BLI_set_test.cc6
1 files changed, 4 insertions, 2 deletions
diff --git a/tests/gtests/blenlib/BLI_set_test.cc b/tests/gtests/blenlib/BLI_set_test.cc
index 8e77a446a97..2387242c94b 100644
--- a/tests/gtests/blenlib/BLI_set_test.cc
+++ b/tests/gtests/blenlib/BLI_set_test.cc
@@ -9,7 +9,7 @@
#include "BLI_vector.hh"
#include "testing/testing.h"
-using namespace blender;
+namespace blender {
TEST(set, DefaultConstructor)
{
@@ -290,7 +290,7 @@ bool operator==(const Type2 &a, const Type1 &b)
return a.value == b.value;
}
-template<> struct blender::DefaultHash<Type1> {
+template<> struct DefaultHash<Type1> {
uint32_t operator()(const Type1 &value) const
{
return value.value;
@@ -511,3 +511,5 @@ TEST(set, Benchmark)
*/
#endif /* Benchmark */
+
+} // namespace blender