Changeset 21a44ca for src/include/cassert

Timestamp:

May 23, 2019, 6:24:18 PM (5 years ago)

Author:

Aaron Moss <a3moss@…>

Branches:

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

Children:

6f4b7f2, d908563

Parents:

94b1f718 (diff), f1ec88a (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of plg.uwaterloo.ca:software/cfa/cfa-cc

File:

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

src/include/cassert

@@ -9 +9 @@
 // Author           : Peter A. Buhr
 // Created On       : Thu Aug 18 13:19:26 2016
-// Last Modified By : Peter A. Buhr
-// Last Modified On : Tue Aug  1 11:56:01 2017
-// Update Count     : 16
+// Last Modified By : Andrew Beach
+// Last Modified On : Thu May 23 15:30:00 2017
+// Update Count     : 17
 //
 
@@ -43 +43 @@
 #endif
 
-template<typename T, typename U>
-static inline __attribute__((nonnull)) T strict_dynamic_cast( const U & src ) {
+enum StrictAllowNull {NonNull, AllowNull};
+
+template<typename T, StrictAllowNull nullable = NonNull, 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);