From 7e67b48b2d0aff3bdbb04d136eea3174169175d7 Mon Sep 17 00:00:00 2001 From: Sebastian Ullrich Date: Wed, 11 Jan 2017 15:02:08 +0100 Subject: [PATCH] chore(util/name): avoid parameter name confusing CLion The overloading of `name` makes it error out on the _entire_ remaining file. --- src/util/name.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/util/name.cpp b/src/util/name.cpp index 16e8736877..c060af8c11 100644 --- a/src/util/name.cpp +++ b/src/util/name.cpp @@ -78,12 +78,12 @@ name::name() { m_ptr = nullptr; } -name::name(name const & prefix, char const * name) { - size_t sz = strlen(name); +name::name(name const & prefix, char const * nam) { + size_t sz = strlen(nam); lean_assert(sz < (1u << 31)); char * mem = new char[sizeof(imp) + sz + 1]; m_ptr = new (mem) imp(true, prefix.m_ptr); - std::memcpy(mem + sizeof(imp), name, sz + 1); + std::memcpy(mem + sizeof(imp), nam, sz + 1); m_ptr->m_str = mem + sizeof(imp); // Emscripten easily breaks with small changes here. The main fix seems to be to use m_ptr->m_str instead of name. m_ptr->m_hash = hash_str(static_cast(sz), m_ptr->m_str, prefix.hash());