dilim/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-07-26 03:04:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix some compiler warnings from the dashboard.

Browse Source 
Unused parameters, ordering of initialization in constructors,
struct/class forward declaration mismatch, and some cleanup of private
areas of class definitions.
This commit is contained in:
Stephen Kelly
2012-09-13 20:24:39 +02:00
parent 808f5529ae
commit abc580229e
3 changed files with 18 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
Source/cmGeneratorExpression.h
View File

@@ -19,7 +19,7 @@ class cmTarget;
class cmMakefile;
class cmListFileBacktrace;
class cmGeneratorExpressionEvaluator;
struct cmGeneratorExpressionEvaluator;
class cmCompiledGeneratorExpression;
@@ -42,12 +42,11 @@ public:
const cmCompiledGeneratorExpression& Parse(std::string const& input);
const cmCompiledGeneratorExpression& Parse(const char* input);
private:
cmListFileBacktrace const& Backtrace;
private:
cmGeneratorExpression(const cmGeneratorExpression &);
void operator=(const cmGeneratorExpression &);
cmListFileBacktrace const& Backtrace;
cmCompiledGeneratorExpression *CompiledExpression;
};
@@ -65,21 +64,19 @@ public:
private:
cmCompiledGeneratorExpression(cmListFileBacktrace const& backtrace,
std::vector<cmGeneratorExpressionEvaluator*> evaluators,
const char *input, bool needsParsing);
const std::vector<cmGeneratorExpressionEvaluator*> &evaluators,
const char *input, bool needsParsing);
friend class cmGeneratorExpression;
private:
const std::vector<cmGeneratorExpressionEvaluator*> Evaluators;
cmListFileBacktrace const& Backtrace;
cmCompiledGeneratorExpression(const cmCompiledGeneratorExpression &);
void operator=(const cmCompiledGeneratorExpression &);
mutable std::set<cmTarget*> Targets;
cmListFileBacktrace const& Backtrace;
const std::vector<cmGeneratorExpressionEvaluator*> Evaluators;
const char* const Input;
const bool NeedsParsing;
mutable std::set<cmTarget*> Targets;
mutable std::string Output;
private:
cmCompiledGeneratorExpression(const cmCompiledGeneratorExpression &);
void operator=(const cmCompiledGeneratorExpression &);
};

16
Source/cmGeneratorExpressionEvaluator.cxx
View File

@@ -56,9 +56,9 @@ static const struct ZeroNode : public cmGeneratorExpressionNode
{
virtual bool GeneratesContent() const { return false; }
std::string Evaluate(const std::vector<std::string> &parameters,
cmGeneratorExpressionContext *context,
const GeneratorExpressionContent *content) const
std::string Evaluate(const std::vector<std::string> &,
cmGeneratorExpressionContext *,
const GeneratorExpressionContent *) const
{
// Unreachable
return std::string();
@@ -70,9 +70,9 @@ static const struct OneNode : public cmGeneratorExpressionNode
{
virtual bool AcceptsSingleArbitraryContentParameter() const { return true; }
std::string Evaluate(const std::vector<std::string> &parameters,
cmGeneratorExpressionContext *context,
const GeneratorExpressionContent *content) const
std::string Evaluate(const std::vector<std::string> &,
cmGeneratorExpressionContext *,
const GeneratorExpressionContent *) const
{
// Unreachable
return std::string();
@@ -136,7 +136,7 @@ static const struct ConfigurationNode : public cmGeneratorExpressionNode
{
virtual int NumExpectedParameters() const { return 0; }
std::string Evaluate(const std::vector<std::string> &parameters,
std::string Evaluate(const std::vector<std::string> &,
cmGeneratorExpressionContext *context,
const GeneratorExpressionContent *) const
{
@@ -428,7 +428,7 @@ std::string GeneratorExpressionContent::Evaluate(
}
int numExpected = node->NumExpectedParameters();
if ((numExpected != -1 && numExpected != parameters.size()))
if ((numExpected != -1 && unsigned int(numExpected) != parameters.size()))
{
if (numExpected == 0)
{

2
Source/cmGeneratorExpressionParser.h
View File

@@ -21,7 +21,7 @@
class cmMakefile;
class cmTarget;
class cmGeneratorExpressionEvaluator;
struct cmGeneratorExpressionEvaluator;
//----------------------------------------------------------------------------
struct cmGeneratorExpressionParser