[Cmake-commits] CMake branch, next, updated. v2.8.8-3525-g2f4b451
Brad King
brad.king at kitware.com
Wed Jul 18 10:05:52 EDT 2012
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".
The branch, next has been updated
via 2f4b45131b37ee07989b1969699ea450a9ddc575 (commit)
via b21cb9ff7407c0fecd069c61ebd0f6512aa2d602 (commit)
via 7fa8e532b6f6148707f12c17c284194003d679e6 (commit)
from 38253097c16a6a86f44fb39f3b1b9a3eb4460cd0 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2f4b45131b37ee07989b1969699ea450a9ddc575
commit 2f4b45131b37ee07989b1969699ea450a9ddc575
Merge: 3825309 b21cb9f
Author: Brad King <brad.king at kitware.com>
AuthorDate: Wed Jul 18 10:05:50 2012 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Jul 18 10:05:50 2012 -0400
Merge topic 'fix-tests-for-gcc-4.7' into next
b21cb9f Tests/ObjC++: Use standard <iostream> header
7fa8e53 Tests/X11: Add missing include <stdlib.h> for 'rand'
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b21cb9ff7407c0fecd069c61ebd0f6512aa2d602
commit b21cb9ff7407c0fecd069c61ebd0f6512aa2d602
Author: Brad King <brad.king at kitware.com>
AuthorDate: Wed Jul 18 10:03:59 2012 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Wed Jul 18 10:03:59 2012 -0400
Tests/ObjC++: Use standard <iostream> header
Drop use of non-standard <iostream.h> header.
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()
{
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7fa8e532b6f6148707f12c17c284194003d679e6
commit 7fa8e532b6f6148707f12c17c284194003d679e6
Author: Brad King <brad.king at kitware.com>
AuthorDate: Wed Jul 18 09:59:15 2012 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Wed Jul 18 09:59:15 2012 -0400
Tests/X11: Add missing include <stdlib.h> for 'rand'
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>
-----------------------------------------------------------------------
Summary of changes:
Tests/ObjC++/objc++.mm | 3 ++-
Tests/X11/HelloWorldX11.cxx | 1 +
2 files changed, 3 insertions(+), 1 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list