Changeset 413f7f8 for src/Common/utility.h

Timestamp:

Jul 7, 2015, 1:49:58 PM (9 years ago)

Author:

Aaron Moss <a3moss@…>

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, string, with_gc

Children:

82dd287

Parents:

e0ff3e6 (diff), 8686f31 (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/Common/utility.h (modified) (3 diffs)

src/Common/utility.h

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Mon Jun  8 14:43:54 2015
-// Update Count     : 13
+// Last Modified On : Thu Jul  2 18:04:41 2015
+// Update Count     : 16
 //
 
@@ -86 +86 @@
 }
 
-static inline std::string assign_strptr( std::string *str ) {
+static inline std::string assign_strptr( const std::string *str ) {
         if ( str == 0 ) {
                 return "";
@@ -97 +97 @@
 }
 
-template< class T, typename ResultType, ResultType (T::* memfunc)() >
+template< class T, typename ResultType, ResultType( T::* memfunc )() >
 ResultType dispatch( T *pT ) {
         return (pT->*memfunc)();