summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorJohn Hodge (sonata) <tpg@mutabah.net>2015-01-22 16:29:47 +0800
committerJohn Hodge (sonata) <tpg@mutabah.net>2015-01-22 16:29:47 +0800
commitb00eaff5fa2db54633cdb28e397d06c2df6e0a5d (patch)
treee61f5d23709f43d3ff6e654b63786a200cadd54f /src
parent1febf19e71549e622420f50f25099ba3005a1133 (diff)
downloadmrust-b00eaff5fa2db54633cdb28e397d06c2df6e0a5d.tar.gz
Oops, bad logic, fixed (!<Str> in assert)
Diffstat (limited to 'src')
-rw-r--r--src/types.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/types.cpp b/src/types.cpp
index d7c70a1e..58d820f5 100644
--- a/src/types.cpp
+++ b/src/types.cpp
@@ -40,13 +40,13 @@ void TypeRef::merge_with(const TypeRef& other)
{
// Ignore if other is wildcard
if( other.m_class == TypeRef::ANY ) {
- assert(other.m_inner_types.size() == 0 && !"TODO: merge_with on bounded _");
+ assert(other.m_inner_types.size() == 0 && "TODO: merge_with on bounded _");
return;
}
// If this is a wildcard, then replace with the othet type
if( m_class == TypeRef::ANY ) {
- assert(m_inner_types.size() == 0 && !"TODO: merge_with on bounded _");
+ assert(m_inner_types.size() == 0 && "TODO: merge_with on bounded _");
*this = other;
return;
}