Changeset 21eb693 for src/tests/.expect/minmax.txt

Timestamp:

Jun 20, 2016, 3:05:35 PM (8 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, ctor, deferred_resn, demangler, enum, forall-pointer-decay, gc_noraii, jacob/cs343-translation, jenkins-sandbox, master, memory, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, with_gc

Children:

554a0db

Parents:

a0dcd2e (diff), 0a346e5 (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 plg2:software/cfa/cfa-cc

Conflicts:

src/tests/Context.c

File:

• src/tests/.expect/minmax.txt (modified) (1 diff)

src/tests/.expect/minmax.txt

@@ +1 @@
+char                    z a     min a
+signed int              4 3     min 3
+unsigned int            4 3     min 3
+signed long int         4 3     min 3
+unsigned long int       4 3     min 3
+signed long long int    4 3     min 3
+unsigned long long int  4 3     min 3
+float                   4 3.1   min 3.1
+double                  4 3.1   min 3.1
+long double             4 3.1   min 3.1
+
+char                    z a     max z
+signed int              4 3     max 4
+unsigned int            4 3     max 4
+signed long int         4 3     max 4
+unsigned long int       4 3     max 4
+signed long long int    4 3     max 4
+unsigned long long int  4 3     max 4
+float                   4 3.1   max 4
+double                  4 3.1   max 4
+long double             4 3.1   max 4