From f8063f91227712cc726fca385dd8b88bf6400c84 Mon Sep 17 00:00:00 2001 From: Reid Spencer Date: Fri, 22 Apr 2005 02:31:56 +0000 Subject: [PATCH] Change some old-style casts to C++ style casts to avoid warnings in XPS compilation. This change has been waiting in the wings for a long time but since Misha just did a global change, I figured now was the time to commit it. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@21431 91177308-0d34-0410-b5e6-96231b3b80d8 --- include/llvm/Support/CommandLine.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/include/llvm/Support/CommandLine.h b/include/llvm/Support/CommandLine.h index e0c5c8f8c08..e99d7bbeafd 100644 --- a/include/llvm/Support/CommandLine.h +++ b/include/llvm/Support/CommandLine.h @@ -294,9 +294,9 @@ LocationClass location(Ty &L) { return LocationClass(L); } //===----------------------------------------------------------------------===// // Enum valued command line option // -#define clEnumVal(ENUMVAL, DESC) #ENUMVAL, (int)ENUMVAL, DESC -#define clEnumValN(ENUMVAL, FLAGNAME, DESC) FLAGNAME, (int)ENUMVAL, DESC -#define clEnumValEnd ((void*)0) +#define clEnumVal(ENUMVAL, DESC) #ENUMVAL, int(ENUMVAL), DESC +#define clEnumValN(ENUMVAL, FLAGNAME, DESC) FLAGNAME, int(ENUMVAL), DESC +#define clEnumValEnd (reinterpret_cast(0)) // values - For custom data types, allow specifying a group of values together // as the values that go into the mapping that the option handler uses. Note @@ -435,7 +435,7 @@ public: typedef DataType parser_data_type; // Implement virtual functions needed by generic_parser_base - unsigned getNumOptions() const { return (unsigned)Values.size(); } + unsigned getNumOptions() const { return unsigned(Values.size()); } const char *getOption(unsigned N) const { return Values[N].first; } const char *getDescription(unsigned N) const { return Values[N].second.second;