diff options
| author | David Cole <david.cole@kitware.com> | 2012-07-24 21:03:24 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2012-07-24 21:03:24 (GMT) |
| commit | d8627aa5b9a7d3e0753cc43841cd74b553fb4cdf (patch) | |
| tree | 2c830f2bbbb1f6fe5cd3e3038c09a9b224ab769b /Tests | |
| parent | 0f87f32fe39140d52bdf0f03289ad468ea4009c0 (diff) | |
| parent | b21cb9ff7407c0fecd069c61ebd0f6512aa2d602 (diff) | |
| download | CMake-d8627aa5b9a7d3e0753cc43841cd74b553fb4cdf.zip CMake-d8627aa5b9a7d3e0753cc43841cd74b553fb4cdf.tar.gz CMake-d8627aa5b9a7d3e0753cc43841cd74b553fb4cdf.tar.bz2 | |
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'
Diffstat (limited to 'Tests')
| -rw-r--r-- | Tests/ObjC++/objc++.mm | 3 | ||||
| -rw-r--r-- | Tests/X11/HelloWorldX11.cxx | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/Tests/ObjC++/objc++.mm b/Tests/ObjC++/objc++.mm index b7ec4b5..f0be256 100644 --- a/Tests/ObjC++/objc++.mm +++ b/Tests/ObjC++/objc++.mm @@ -1,5 +1,6 @@ -#import <iostream.h> #import <Cocoa/Cocoa.h> +#import <iostream> +using namespace std; int main() { diff --git a/Tests/X11/HelloWorldX11.cxx b/Tests/X11/HelloWorldX11.cxx index 5bbc19a..e3c9dd9 100644 --- a/Tests/X11/HelloWorldX11.cxx +++ b/Tests/X11/HelloWorldX11.cxx @@ -15,6 +15,7 @@ #define MAIN_H 1 #include <iostream> +#include <stdlib.h> /* include the X library headers */ #include <X11/Xlib.h> |