Changeset 7ff30d07 for src/Common

Timestamp:

Jun 14, 2016, 1:23:18 PM (9 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, ctor, deferred_resn, demangler, enum, forall-pointer-decay, gc_noraii, jacob/cs343-translation, jenkins-sandbox, master, memory, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, with_gc

Children:

545ef59, c738ca4, ee51534

Parents:

6cbc25a (diff), c8c03683 (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

Conflicts:

Makefile.in
aclocal.m4
configure
src/Makefile.in
src/Tests/Context.c
src/driver/Makefile.in
src/examples/Makefile.in
src/examples/ctxts.c
src/examples/esskaykay.c
src/libcfa/Makefile.in

File:

• src/Common/utility.h (modified) (2 diffs)

src/Common/utility.h

@@ -9 +9 @@
 // Author           : Richard C. Bilson
 // Created On       : Mon May 18 07:44:20 2015
-// Last Modified By : Rob Schluntz
-// Last Modified On : Thu Apr 28 13:18:24 2016
-// Update Count     : 16
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Wed Jun  8 17:33:59 2016
+// Update Count     : 22
 //
 
@@ -33 +33 @@
 }
 
+template<typename T, typename U>
+struct maybeBuild_t {
+        static T * doit( const U *orig ) {
+                if ( orig ) {
+                        return orig->build();
+                } else {
+                        return 0;
+                } // if
+        }
+};
+
 template< typename T, typename U >
 static inline T * maybeBuild( const U *orig ) {
-        if ( orig ) {
-                return orig->build();
-        } else {
-                return 0;
-        } // if
+        return maybeBuild_t<T,U>::doit(orig);
 }