Changeset 2f26687a for src/SynTree

Timestamp:

Mar 14, 2017, 3:17:20 PM (8 years ago)

Author:

Rob Schluntz <rschlunt@…>

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:

1fbab5a

Parents:

88d1066 (diff), 4da6a6c (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:/u/cforall/software/cfa/cfa-cc

File:

• src/SynTree/Type.h (modified) (5 diffs)

src/SynTree/Type.h

@@ -25 +25 @@
   public:
         struct Qualifiers {
-                Qualifiers(): isConst( false ), isVolatile( false ), isRestrict( false ), isLvalue( false ), isAtomic( false ) {}
-                Qualifiers( bool isConst, bool isVolatile, bool isRestrict, bool isLvalue, bool isAtomic ): isConst( isConst ), isVolatile( isVolatile ), isRestrict( isRestrict ), isLvalue( isLvalue ), isAtomic( isAtomic ) {}
+                Qualifiers(): isConst( false ), isVolatile( false ), isRestrict( false ), isLvalue( false ), isAtomic( false ), isMutex( false ) {}
+                Qualifiers( bool isConst, bool isVolatile, bool isRestrict, bool isLvalue, bool isAtomic, bool isMutex ): isConst( isConst ), isVolatile( isVolatile ), isRestrict( isRestrict ), isLvalue( isLvalue ), isAtomic( isAtomic ), isMutex( isMutex ) {}
 
                 Qualifiers &operator&=( const Qualifiers &other );
@@ -45 +45 @@
                 bool isLvalue;
                 bool isAtomic;
+                bool isMutex;
         };
 
@@ -511 +512 @@
         isLvalue &= other.isLvalue;
         isAtomic &= other.isAtomic;
+        isMutex &= other.isMutex;
         return *this;
 }
@@ -520 +522 @@
         isLvalue |= other.isLvalue;
         isAtomic |= other.isAtomic;
+        isMutex |= other.isMutex;
         return *this;
 }
@@ -528 +531 @@
         if ( other.isRestrict ) isRestrict = 0;
         if ( other.isAtomic ) isAtomic = 0;
+        if ( other.isMutex ) isMutex = 0;
         return *this;
 }