Changeset 87d13cd for src/SynTree

Timestamp:

Mar 21, 2017, 10:07:52 PM (9 years ago)

Author:

Peter A. Buhr <pabuhr@…>

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:

cb91437

Parents:

829c907 (diff), a53e10a (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:

fix conflicit in iostream.c

File:

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

src/SynTree/Type.h

@@ -117 +117 @@
                 bool operator!=( Qualifiers other ) const { return (val & Mask) != (other.val & Mask); }
                 bool operator<=( Qualifiers other ) const {
-                        return is_const <= other.is_const && is_volatile <= other.is_volatile &&
-                                is_mutex >= other.is_mutex && is_atomic == other.is_atomic;
+                        return is_const    <= other.is_const        //Any non-const converts to const without cost
+                                        && is_volatile <= other.is_volatile     //Any non-volatile converts to volatile without cost
+                                        && is_mutex    >= other.is_mutex        //Any mutex converts to non-mutex without cost
+                                        && is_atomic   == other.is_atomic;      //No conversion from atomic to non atomic is free
                 }
                 bool operator<( Qualifiers other ) const { return *this != other && *this <= other; }
@@ -155 +157 @@
         virtual Type * getComponent( unsigned i ) { assertf( size() == 1 && i == 0, "Type::getComponent was called with size %d and index %d\n", size(), i ); return this; }
 
+        /// return type without outer pointers and arrays
         Type *stripDeclarator();