Merge topic 'fix-tests-for-gcc-4.7'

b21cb9f Tests/ObjC++: Use standard <iostream> header
7fa8e53 Tests/X11: Add missing include <stdlib.h> for 'rand'
This commit is contained in:
David Cole 2012-07-24 17:03:24 -04:00 committed by CMake Topic Stage
commit d8627aa5b9
2 changed files with 3 additions and 1 deletions

View File

@ -1,5 +1,6 @@
#import <iostream.h>
#import <Cocoa/Cocoa.h> #import <Cocoa/Cocoa.h>
#import <iostream>
using namespace std;
int main() int main()
{ {

View File

@ -15,6 +15,7 @@
#define MAIN_H 1 #define MAIN_H 1
#include <iostream> #include <iostream>
#include <stdlib.h>
/* include the X library headers */ /* include the X library headers */
#include <X11/Xlib.h> #include <X11/Xlib.h>