Changeset f80e0218 for src/Common/utility.h

Timestamp:

Jun 30, 2016, 4:32:56 PM (10 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:

ea29e73

Parents:

1b5c81ed (diff), 84d4d6f (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' into gc_noraii

Conflicts:

Jenkinsfile
src/SymTab/Validate.cc

File:

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

src/Common/utility.h

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// utility.h -- 
+// utility.h --
 //
 // Author           : Richard C. Bilson
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Thu Jul  2 18:04:41 2015
-// Update Count     : 16
+// 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);
 }
 
@@ -62 +69 @@
                         os << std::string( indent,  ' ' );
                         (*i)->print( os, indent + 2 );
+                        // need an endl after each element because it's not easy to know when each individual item should end
                         os << std::endl;
                 } // if
@@ -128 +136 @@
 }
 
-template < typename T > 
+template < typename T >
 std::string toString ( T value ) {
         std::ostringstream os;