Changeset dafe9e1 for src/include

Timestamp:

Jun 3, 2019, 1:29:56 PM (5 years ago)

Author:

Andrew Beach <ajbeach@…>

Branches:

ADT, arm-eh, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

4ae2364

Parents:

a935892

Message:

Fixed broken destructor cycles. Cleaned up strict_dynamic_cast.

File:

• src/include/cassert (modified) (2 diffs)

src/include/cassert

@@ -10 +10 @@
 // Created On       : Thu Aug 18 13:19:26 2016
 // Last Modified By : Andrew Beach
-// Last Modified On : Thu May 23 15:30:00 2017
-// Update Count     : 17
+// Last Modified On : Mon Jun  3 13:11:00 2017
+// Update Count     : 18
 //
 
@@ -43 +43 @@
 #endif
 
-enum StrictAllowNull {NonNull, AllowNull};
-
-template<typename T, StrictAllowNull nullable = NonNull, typename U>
+template<typename T, typename U>
 static inline T strict_dynamic_cast( const U & src ) {
-        if (nullable == AllowNull && src == nullptr) {
-                return nullptr;
-        }
         assert(src);
         T ret = dynamic_cast<T>(src);
         assertf(ret, "%s", toString(src).c_str());
         return ret;
+}
+
+template<typename T, decltype(nullptr) null, typename U>
+static inline T strict_dynamic_cast( const U & src ) {
+        return src ? strict_dynamic_cast<T, U>( src ) : nullptr;
 }