[Cmake-commits] CMake branch, next, updated. v3.3.0-rc3-717-g9303067
Brad King
brad.king at kitware.com
Mon Jun 29 09:56:31 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 93030679028c692bb96fc11c8e52e8f145dd1e30 (commit)
via 1de07797a39e03033f4f8cde7be3b4b6c4c5e816 (commit)
via 229e7f8a25efc971ad6869787565f96b3c167a7b (commit)
from 97d65a7ecf2ce711c87c53ef7be205b9b987efc2 (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=93030679028c692bb96fc11c8e52e8f145dd1e30
commit 93030679028c692bb96fc11c8e52e8f145dd1e30
Merge: 97d65a7 1de0779
Author: Brad King <brad.king at kitware.com>
AuthorDate: Mon Jun 29 09:56:30 2015 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Jun 29 09:56:30 2015 -0400
Merge topic 'auto_export_dll_symbols' into next
1de07797 bindexplib: Fix compilation warnings
229e7f8a Fix generation of object list file
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1de07797a39e03033f4f8cde7be3b4b6c4c5e816
commit 1de07797a39e03033f4f8cde7be3b4b6c4c5e816
Author: Brad King <brad.king at kitware.com>
AuthorDate: Mon Jun 29 09:55:31 2015 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Mon Jun 29 09:55:31 2015 -0400
bindexplib: Fix compilation warnings
diff --git a/Source/bindexplib.cxx b/Source/bindexplib.cxx
index 0dd9f75..879d9bc 100644
--- a/Source/bindexplib.cxx
+++ b/Source/bindexplib.cxx
@@ -71,8 +71,6 @@
*----------------------------------------------------------------------
*/
-static char sccsid[] = "@(#) winDumpExts.c 1.2 95/10/03 15:27:34";
-
#include <cmsys/Encoding.hxx>
#include <windows.h>
#include <stdio.h>
@@ -81,23 +79,6 @@ static char sccsid[] = "@(#) winDumpExts.c 1.2 95/10/03 15:27:34";
#include <iostream>
/*
-* The names of the first group of possible symbol table storage classes
-*/
-char * SzStorageClass1[] = {
- "NULL","AUTOMATIC","EXTERNAL","STATIC","REGISTER","EXTERNAL_DEF","LABEL",
- "UNDEFINED_LABEL","MEMBER_OF_STRUCT","ARGUMENT","STRUCT_TAG",
- "MEMBER_OF_UNION","UNION_TAG","TYPE_DEFINITION","UNDEFINED_STATIC",
- "ENUM_TAG","MEMBER_OF_ENUM","REGISTER_PARAM","BIT_FIELD"
-};
-
-/*
-* The names of the second group of possible symbol table storage classes
-*/
-char * SzStorageClass2[] = {
- "BLOCK","FUNCTION","END_OF_STRUCT","FILE","SECTION","WEAK_EXTERNAL"
-};
-
-/*
+ * Utility func, strstr with size
+ */
const char* StrNStr(const char* start, const char* find, size_t &size) {
@@ -110,7 +91,7 @@ const char* StrNStr(const char* start, const char* find, size_t &size) {
}
len = strlen(find);
- while (hint = (const char*) memchr(start, find[0], size-len+1)) {
+ while ((hint = (const char*) memchr(start, find[0], size-len+1))) {
size -= (hint - start);
if (!strncmp(hint, find, len))
return hint;
@@ -131,7 +112,7 @@ const char* StrNStr(const char* start, const char* find, size_t &size) {
*/
int
HaveExportedObjects(PIMAGE_FILE_HEADER pImageFileHeader,
- PIMAGE_SECTION_HEADER pSectionHeaders, FILE *fout)
+ PIMAGE_SECTION_HEADER pSectionHeaders)
{
static int fImportFlag = 0; /* The status is nor defined yet */
WORD i;
@@ -314,7 +295,7 @@ DumpObjFile(PIMAGE_FILE_HEADER pImageFileHeader, FILE *fout)
int haveExports = HaveExportedObjects(pImageFileHeader,
- PCOFFSectionHeaders, fout);
+ PCOFFSectionHeaders);
if (!haveExports)
DumpExternalsObjects(PCOFFSymbolTable, PCOFFSectionHeaders,
fout, COFFSymbolCount);
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=229e7f8a25efc971ad6869787565f96b3c167a7b
commit 229e7f8a25efc971ad6869787565f96b3c167a7b
Author: Brad King <brad.king at kitware.com>
AuthorDate: Mon Jun 29 09:51:17 2015 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Mon Jun 29 09:51:17 2015 -0400
Fix generation of object list file
diff --git a/Source/cmGlobalVisualStudioGenerator.cxx b/Source/cmGlobalVisualStudioGenerator.cxx
index 7a8ac86..a41e843 100644
--- a/Source/cmGlobalVisualStudioGenerator.cxx
+++ b/Source/cmGlobalVisualStudioGenerator.cxx
@@ -13,6 +13,7 @@
#include "cmGlobalVisualStudioGenerator.h"
#include "cmCallVisualStudioMacro.h"
+#include "cmGeneratedFileStream.h"
#include "cmGeneratorTarget.h"
#include "cmLocalVisualStudioGenerator.h"
#include "cmMakefile.h"
@@ -923,7 +924,7 @@ void cmGlobalVisualStudioGenerator::AddSymbolExportCommand(
cmSystemTools::MakeDirectory(objs_file.c_str());
objs_file += "/objects.txt";
cmdl.push_back(objs_file);
- std::ofstream fout(objs_file.c_str());
+ cmGeneratedFileStream fout(objs_file.c_str());
if(!fout)
{
cmSystemTools::Error("could not open ", objs_file.c_str());
diff --git a/Source/cmMakefileLibraryTargetGenerator.cxx b/Source/cmMakefileLibraryTargetGenerator.cxx
index f807517..ffdd27b 100644
--- a/Source/cmMakefileLibraryTargetGenerator.cxx
+++ b/Source/cmMakefileLibraryTargetGenerator.cxx
@@ -591,7 +591,7 @@ void cmMakefileLibraryTargetGenerator::WriteLibraryRules
cmLocalGenerator::SHELL);
real_link_commands.push_back(cmd);
// create a list of obj files for the -E __create_def to read
- std::ofstream fout(objlist_file.c_str());
+ cmGeneratedFileStream fout(objlist_file.c_str());
for(std::vector<std::string>::const_iterator i = this->Objects.begin();
i != this->Objects.end(); ++i)
{
diff --git a/Source/cmNinjaNormalTargetGenerator.cxx b/Source/cmNinjaNormalTargetGenerator.cxx
index 4df0993..4603de8 100644
--- a/Source/cmNinjaNormalTargetGenerator.cxx
+++ b/Source/cmNinjaNormalTargetGenerator.cxx
@@ -648,7 +648,7 @@ void cmNinjaNormalTargetGenerator::WriteLinkStatement()
cmLocalGenerator::SHELL);
preLinkCmdLines.push_back(cmd);
// create a list of obj files for the -E __create_def to read
- std::ofstream fout(obj_list_file.c_str());
+ cmGeneratedFileStream fout(obj_list_file.c_str());
for(cmNinjaDeps::iterator i=objs.begin(); i != objs.end(); ++i)
{
fout << *i << "\n";
-----------------------------------------------------------------------
Summary of changes:
Source/bindexplib.cxx | 25 +++----------------------
Source/cmGlobalVisualStudioGenerator.cxx | 3 ++-
Source/cmMakefileLibraryTargetGenerator.cxx | 2 +-
Source/cmNinjaNormalTargetGenerator.cxx | 2 +-
4 files changed, 7 insertions(+), 25 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list