Changeset 85d44c6 for libcfa/prelude/prelude-gen.cc

Timestamp:

Feb 14, 2019, 10:23:51 PM (7 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

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

Children:

fba51ab

Parents:

6d01d89 (diff), e15853c (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 conflict

File:

• libcfa/prelude/prelude-gen.cc (modified) (3 diffs)

libcfa/prelude/prelude-gen.cc

@@ -34 +34 @@
 #if defined(__i386__) || defined(__ia64__) || defined(__x86_64__)
         { "__float80"             , true , true , },
-        { "_Float128"             , true , true , },
+        { "__float128"            , true , true , },
 #endif
 };
@@ -153 +153 @@
         cout << "signed int ?==?( one_t, one_t ),                                                       ?!=?( one_t, one_t );" << endl;
         cout << "signed int ?==?( _Bool, _Bool ),                                                       ?!=?( _Bool, _Bool );" << endl;
-        cout << "signed int     !?( _Bool );" << endl;
+        cout << "signed int !?( _Bool );" << endl;
 
         for (auto op : arithmeticOperators) {
@@ -386 +386 @@
         cout << endl;
 }
-