[Cmake-commits] CMake branch, next, updated. v3.3.1-2694-gb817975

[Gregor Jasny]

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  b8179759b8cbeebab8f3655eef0f1c90c84b786f (commit)
       via  61b6d52ad01dec76f8b798f1c52a5c03cf9e45d8 (commit)
      from  8033831b5e3475ea52eaf83ab219615dee2be1df (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=b8179759b8cbeebab8f3655eef0f1c90c84b786f
commit b8179759b8cbeebab8f3655eef0f1c90c84b786f
Merge: 8033831 61b6d52
Author:     Gregor Jasny <gjasny at googlemail.com>
AuthorDate: Tue Sep 1 14:35:16 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Sep 1 14:35:16 2015 -0400

    Merge topic 'swift2-compatibility' into next
    
    61b6d52a Swift: Use dump instead of println


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=61b6d52ad01dec76f8b798f1c52a5c03cf9e45d8
commit 61b6d52ad01dec76f8b798f1c52a5c03cf9e45d8
Author:     Gregor Jasny <gjasny at googlemail.com>
AuthorDate: Tue Sep 1 20:32:38 2015 +0200
Commit:     Gregor Jasny <gjasny at googlemail.com>
CommitDate: Tue Sep 1 20:32:38 2015 +0200

    Swift: Use dump instead of println
    
    With Swift 2.0 in Xcode7 the println function was renamed into
    print. Use dump function instead which adds newlines like println.

diff --git a/Tests/SwiftMix/SwiftMain.swift b/Tests/SwiftMix/SwiftMain.swift
index 9af9883..7e7c4ab 100644
--- a/Tests/SwiftMix/SwiftMain.swift
+++ b/Tests/SwiftMix/SwiftMain.swift
@@ -1,9 +1,9 @@
 @objc class SwiftMainClass {
   class func SwiftMain(argc:Int, argv:UnsafePointer<UnsafePointer<CChar>>) -> Int32 {
-    println("argc: \(argc)")
+    dump("argc: \(argc)")
     for (var i = 0; i < argc; ++i) {
       var argi = String.fromCString(argv[i])
-      println("arg[\(i)]: \(argi)");
+      dump("arg[\(i)]: \(argi)");
     }
     return 0;
   }
diff --git a/Tests/SwiftOnly/main.swift b/Tests/SwiftOnly/main.swift
index 67be986..28560d0 100644
--- a/Tests/SwiftOnly/main.swift
+++ b/Tests/SwiftOnly/main.swift
@@ -1 +1 @@
-println("SwiftOnly")
+dump("SwiftOnly")

-----------------------------------------------------------------------

Summary of changes:
 Tests/SwiftMix/SwiftMain.swift |    4 ++--
 Tests/SwiftOnly/main.swift     |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
CMake