[llvm-commits] CVS: llvm-test/SingleSource/UnitTests/Integer/switch.c

[Reid Spencer]

Changes in directory llvm-test/SingleSource/UnitTests/Integer:

switch.c updated: 1.4 -> 1.5
---
Log message:

Remove syntax errors from merge.
Use constant expressions instead of direct values.
Fix header to 80 cols.


---
Diffs of the changes:  (+3 -9)

 switch.c |   12 +++---------
 1 files changed, 3 insertions(+), 9 deletions(-)


Index: llvm-test/SingleSource/UnitTests/Integer/switch.c
diff -u llvm-test/SingleSource/UnitTests/Integer/switch.c:1.4 llvm-test/SingleSource/UnitTests/Integer/switch.c:1.5
--- llvm-test/SingleSource/UnitTests/Integer/switch.c:1.4	Mon Jan 22 14:47:27 2007
+++ llvm-test/SingleSource/UnitTests/Integer/switch.c	Mon Jan 22 15:06:21 2007
@@ -1,28 +1,22 @@
-//===--- switch.c --- Test Cases for Bit Accurate Types -----------------===//
+//===--- switch.c --- Test Cases for Bit Accurate Types -------------------===//
 //
 // This file was developed by Guoling han and donated to the LLVM research
 // group and is distributed under the University of Illinois Open Source
 // License. See LICENSE.TXT for details.
-//===-------------------------------------------------------------------===//
+//===----------------------------------------------------------------------===//
 //
 // This is a test for switch statement. The switch value is a
 // non-regular bitwidth. test(int3 c) function return the value of the
 // argument c. 
 //
-//===--------------------------------------------------------------------===//
+//===----------------------------------------------------------------------===//
 #include <stdio.h>
 
 typedef unsigned int __attribute__ ((bitwidth(7))) int7;
 typedef unsigned int __attribute__ ((bitwidth(3))) int3;
 
-<<<<<<< switch.c
-=======
 const int7 zero = (int7)(1 << 8); // constant 0;
 static int3 seven = (int3)0xf; // constant 7;
->>>>>>> 1.2
-
-const int7 zero = 0;         // constant 0;
-static int3 seven = 7;       // constant 7;
 
 int3  test(int3 c)
 {