Changeset 23a08aa0 for src/Parser/DeclarationNode.cc

Timestamp:

Sep 19, 2022, 8:11:02 PM (3 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

ADT, ast-experimental, master, pthread-emulation

Children:

aa9f215

Parents:

ebf8ca5 (diff), ae1d151 (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 merge conflict

File:

• src/Parser/DeclarationNode.cc (modified) (2 diffs)

src/Parser/DeclarationNode.cc

@@ -262 +262 @@
         newnode->type->enumeration.anon = name == nullptr;
         if ( base && base->type)  {
-                newnode->type->base = base->type;       
+                newnode->type->base = base->type;
         } // if
 
@@ -505 +505 @@
                         } // for
                         // src is the new item being added and has a single bit
-                } else if ( ! src->storageClasses.is_threadlocal ) { // conflict ?
+                } else if ( ! src->storageClasses.is_threadlocal_any() ) { // conflict ?
                         appendError( error, string( "conflicting " ) + Type::StorageClassesNames[storageClasses.ffs()] +
                                                  " & " + Type::StorageClassesNames[src->storageClasses.ffs()] );