Changeset 3d5701e for src/SymTab/ManglerCommon.cc

Timestamp:

Feb 25, 2020, 1:17:33 PM (6 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

ADT, arm-eh, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

7dc2e015

Parents:

9fb8f01 (diff), dd9e1ca (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:

resolve conflict

File:

• src/SymTab/ManglerCommon.cc (modified) (3 diffs)

src/SymTab/ManglerCommon.cc

@@ -10 +10 @@
 // Created On       : Sun May 17 21:44:03 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Thu Feb 14 17:06:37 2019
-// Update Count     : 26
+// Last Modified On : Fri Dec 13 14:54:38 2019
+// Update Count     : 28
 //
 
@@ -88 +88 @@
                                 { Type::Atomic, "DA" }, // A is array, so need something unique for atmoic. For now, go with multiletter DA
                                 { Type::Mutex, "X" },
-                                { Type::Lvalue, "L" },
                         };
 
@@ -105 +104 @@
                         const std::string typeVariables[] = {
                                 "BD", // dtype
+                                "BO", // otype
                                 "BF", // ftype
                                 "BT", // ttype