[llvm-commits] CVS: llvm-test/MultiSource/Benchmarks/Prolangs-C++/office/Makefile office.cpp

[Chris Lattner]

Changes in directory llvm-test/MultiSource/Benchmarks/Prolangs-C++/office:

Makefile added (r1.1)
office.cpp updated: 1.1 -> 1.2
---
Log message:

Make this work


---
Diffs of the changes:  (+10 -2)

Index: llvm-test/MultiSource/Benchmarks/Prolangs-C++/office/Makefile
diff -c /dev/null llvm-test/MultiSource/Benchmarks/Prolangs-C++/office/Makefile:1.1
*** /dev/null	Mon Oct  4 22:38:58 2004
--- llvm-test/MultiSource/Benchmarks/Prolangs-C++/office/Makefile	Mon Oct  4 22:38:47 2004
***************
*** 0 ****
--- 1,7 ----
+ LEVEL = ../../../..
+ 
+ PROG     = office
+ #LIBS  = -lstdc++
+ LDFLAGS = -lstdc++
+ include $(LEVEL)/MultiSource/Makefile.multisrc
+ 


Index: llvm-test/MultiSource/Benchmarks/Prolangs-C++/office/office.cpp
diff -u llvm-test/MultiSource/Benchmarks/Prolangs-C++/office/office.cpp:1.1 llvm-test/MultiSource/Benchmarks/Prolangs-C++/office/office.cpp:1.2
--- llvm-test/MultiSource/Benchmarks/Prolangs-C++/office/office.cpp:1.1	Mon Oct  4 15:01:14 2004
+++ llvm-test/MultiSource/Benchmarks/Prolangs-C++/office/office.cpp	Mon Oct  4 22:38:47 2004
@@ -1,6 +1,7 @@
                                        // Chapter 11 - Program 4
-#include <stream.h>
+#include <iostream>
 #include "supervsr.h"
+using namespace std;
 
 // In all cases, init_data assigns values to the class variables and
 //  display outputs the values to the monitor for inspection.
@@ -101,7 +102,7 @@
 
 person *staff1,*staff2,*staff3,*staff4;
 
-main()
+int main()
 {
 supervisor *suppt;
 programmer *progpt;