[Cmake-commits] CMake branch, next, updated. v3.6.2-2171-g229c3f4

[Brad King]

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  229c3f4b30b3cd49d12e2ad74fdf92c7503f0bdc (commit)
       via  cbf5c655855d6249a2d6c44c3fc6942777f9eb68 (commit)
       via  5afd6505b59636275b4f5fef5d2d9d6ec496dc65 (commit)
      from  4e952dabb663c8c65844d608d76f7bb7c691ab00 (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 -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=229c3f4b30b3cd49d12e2ad74fdf92c7503f0bdc
commit 229c3f4b30b3cd49d12e2ad74fdf92c7503f0bdc
Merge: 4e952da cbf5c65
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Sat Sep 17 07:30:53 2016 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sat Sep 17 07:30:53 2016 -0400

    Merge topic 'cmake-server-basic' into next
    
    cbf5c655 fixup! cmake-server: Add unit test
    5afd6505 fixup! cmake-server: Bare-bones server implementation


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=cbf5c655855d6249a2d6c44c3fc6942777f9eb68
commit cbf5c655855d6249a2d6c44c3fc6942777f9eb68
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Sat Sep 17 07:25:35 2016 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Sat Sep 17 07:25:35 2016 -0400

    fixup! cmake-server: Add unit test

diff --git a/Tests/Server/CMakeLists.txt b/Tests/Server/CMakeLists.txt
index 565cf7c..8daf12a 100644
--- a/Tests/Server/CMakeLists.txt
+++ b/Tests/Server/CMakeLists.txt
@@ -1,5 +1,5 @@
 cmake_minimum_required(VERSION 3.4)
-project(ServerTests CXX)
+project(Server CXX)
 
 find_package(PythonInterp REQUIRED)
 

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5afd6505b59636275b4f5fef5d2d9d6ec496dc65
commit 5afd6505b59636275b4f5fef5d2d9d6ec496dc65
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Sat Sep 17 07:24:36 2016 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Sat Sep 17 07:24:36 2016 -0400

    fixup! cmake-server: Bare-bones server implementation

diff --git a/Source/cmServer.cxx b/Source/cmServer.cxx
index dc6e4be..123b6a4 100644
--- a/Source/cmServer.cxx
+++ b/Source/cmServer.cxx
@@ -43,8 +43,8 @@ typedef struct
 void alloc_buffer(uv_handle_t* handle, size_t suggested_size, uv_buf_t* buf)
 {
   (void)handle;
-  *buf =
-    uv_buf_init(static_cast<char*>(malloc(suggested_size)), suggested_size);
+  *buf = uv_buf_init(static_cast<char*>(malloc(suggested_size)),
+                     static_cast<unsigned int>(suggested_size));
 }
 
 void free_write_req(uv_write_t* req)
@@ -66,8 +66,8 @@ void write_data(uv_stream_t* dest, std::string content, uv_write_cb cb)
 {
   write_req_t* req = static_cast<write_req_t*>(malloc(sizeof(write_req_t)));
   req->req.data = dest->data;
-  req->buf =
-    uv_buf_init(static_cast<char*>(malloc(content.size())), content.size());
+  req->buf = uv_buf_init(static_cast<char*>(malloc(content.size())),
+                         static_cast<unsigned int>(content.size()));
   memcpy(req->buf.base, content.c_str(), content.size());
   uv_write(reinterpret_cast<uv_write_t*>(req), static_cast<uv_stream_t*>(dest),
            &req->buf, 1, cb);

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

Summary of changes:
 Source/cmServer.cxx         |    8 ++++----
 Tests/Server/CMakeLists.txt |    2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
CMake