Changeset 28c9ff3 for src/Common/utility.h

Timestamp:

Jun 1, 2017, 4:57:02 PM (7 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

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

Children:

b1d4d60

Parents:

b78275b (diff), 676cc8c (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) (2 diffs)

src/Common/utility.h

@@ -244 +244 @@
         ValueGuard(T& inRef) : old(inRef), ref(inRef) {}
         ~ValueGuard() { ref = old; }
+};
+
+template< typename T >
+struct ValueGuardPtr {
+        T old;
+        T* ref;
+
+        ValueGuardPtr(T * inRef) : old( inRef ? *inRef : T() ), ref(inRef) {}
+        ~ValueGuardPtr() { if( ref ) *ref = old; }
+};
+
+template< typename T >
+struct ValueGuardPtr< std::list< T > > {
+        std::list< T > old;
+        std::list< T >* ref;
+
+        ValueGuardPtr( std::list< T > * inRef) : old(), ref(inRef) {
+                if( ref ) { swap( *ref, old ); }
+        }
+        ~ValueGuardPtr() { if( ref ) { swap( *ref, old ); } }
 };
 
@@ -334 +354 @@
         {}
 
+        CodeLocation( const CodeLocation& rhs ) = default;
+
         bool isSet () const {
                 return -1 != linenumber;