[Cmake-commits] CMake branch, next, updated. v3.3.0-rc2-707-gadfbae3
Bill Hoffman
bill.hoffman at kitware.com
Fri Jun 26 11:07:19 EDT 2015
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 adfbae333bffef484a851a7e6c97d5a8ca459bc5 (commit)
via 6d42ecb5775b3a9b83e96b3f8db2c62a0f5913fe (commit)
from d71d2d58dfb31a670e0c19ab5a17f5152b04d676 (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=adfbae333bffef484a851a7e6c97d5a8ca459bc5
commit adfbae333bffef484a851a7e6c97d5a8ca459bc5
Merge: d71d2d5 6d42ecb
Author: Bill Hoffman <bill.hoffman at kitware.com>
AuthorDate: Fri Jun 26 11:07:18 2015 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Jun 26 11:07:18 2015 -0400
Merge topic 'auto_export_dll_symbols' into next
6d42ecb5 fix various dashboard warnings and errors
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6d42ecb5775b3a9b83e96b3f8db2c62a0f5913fe
commit 6d42ecb5775b3a9b83e96b3f8db2c62a0f5913fe
Author: Bill Hoffman <bill.hoffman at kitware.com>
AuthorDate: Fri Jun 26 11:07:06 2015 -0400
Commit: Bill Hoffman <bill.hoffman at kitware.com>
CommitDate: Fri Jun 26 11:07:06 2015 -0400
fix various dashboard warnings and errors
diff --git a/Tests/RunCMake/AutoExportDll/hello.cxx b/Tests/RunCMake/AutoExportDll/hello.cxx
index 807a811..ad83420 100644
--- a/Tests/RunCMake/AutoExportDll/hello.cxx
+++ b/Tests/RunCMake/AutoExportDll/hello.cxx
@@ -9,5 +9,5 @@ void hello()
{
std::cout << "hello";
}
-void Hello::operator delete[](void* ptr) {};
-void Hello::operator delete(void* ptr) {};
+void Hello::operator delete[](void*) {};
+void Hello::operator delete(void*) {};
diff --git a/Tests/RunCMake/AutoExportDll/hello.h b/Tests/RunCMake/AutoExportDll/hello.h
index a151bd1..3749b97 100644
--- a/Tests/RunCMake/AutoExportDll/hello.h
+++ b/Tests/RunCMake/AutoExportDll/hello.h
@@ -13,6 +13,6 @@ class Hello
public:
static winexport int Data;
void real();
- static void operator delete[](void* ptr);
- static void operator delete(void* ptr);
+ static void operator delete[](void*);
+ static void operator delete(void*);
};
diff --git a/Tests/RunCMake/AutoExportDll/say.cxx b/Tests/RunCMake/AutoExportDll/say.cxx
index 015c3a8..655b3c2 100644
--- a/Tests/RunCMake/AutoExportDll/say.cxx
+++ b/Tests/RunCMake/AutoExportDll/say.cxx
@@ -1,4 +1,4 @@
-#include <iostream>
+#include <stdio.h>
#include "hello.h"
#ifdef _MSC_VER
#include "windows.h"
@@ -26,10 +26,12 @@ int main()
Hello h;
h.real();
hello();
- std::cout << " ";
+ printf(" ");
world();
- std::cout << "\n" << foo() << "\n";
- std::cout << "\n" << bar() << "\n";
- std::cout << "\n";
+ printf("\n");
+ foo();
+ printf("\n");
+ bar();
+ printf("\n");
return 0;
}
-----------------------------------------------------------------------
Summary of changes:
Tests/RunCMake/AutoExportDll/hello.cxx | 4 ++--
Tests/RunCMake/AutoExportDll/hello.h | 4 ++--
Tests/RunCMake/AutoExportDll/say.cxx | 12 +++++++-----
3 files changed, 11 insertions(+), 9 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list