diff_file.diff
692 Bytes
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
--- Syntax Highlighting Test File for Diff results
--- Comment Lines are like this
--- cpp.cpp 2007-06-26 07:14:22.000000000 -0500
+++ hello_diff.cpp 2007-08-06 17:01:47.000000000 -0500
@@ -2,24 +2,29 @@
*
*/
#include<iostream>
-#include<cstdlib>
using namespace std;
int main(void)
{
- cout << "\nHello World" << endl;
+ cout << "\nHello World!" << endl;
cout << "\nUnclosed String << endl;
// One line comment
int a = 0;
-
- exit(a);
+ cout << add(a, 22) << endl;
}
-int add(x, y)
+// Add two numbers
+int add(int x, int y)
{
return x + y;
}
+// Subtract two numbers
+int sub(int x, int y)
+{
+ return x - y;
+}
+
// EOF