summaryrefslogtreecommitdiff
path: root/Source
diff options
context:
space:
mode:
authorAndy Cedilnik <andy.cedilnik@kitware.com>2002-10-10 08:11:37 -0400
committerAndy Cedilnik <andy.cedilnik@kitware.com>2002-10-10 08:11:37 -0400
commitf6a1218e102373bd945cd58c9d01d0200bcb3a54 (patch)
treead47f5f0a8c7422994f81be24801b4ba26f49d83 /Source
parent089429fee9142fce0890801235fd2f5d1fc3275d (diff)
downloadcmake-f6a1218e102373bd945cd58c9d01d0200bcb3a54.tar.gz
Remove warning
Diffstat (limited to 'Source')
-rw-r--r--Source/WXDialog/cmWXMainFrame.cxx7
-rw-r--r--Source/cmSetCommand.cxx9
2 files changed, 8 insertions, 8 deletions
diff --git a/Source/WXDialog/cmWXMainFrame.cxx b/Source/WXDialog/cmWXMainFrame.cxx
index f163f45a32..b3db5be45f 100644
--- a/Source/WXDialog/cmWXMainFrame.cxx
+++ b/Source/WXDialog/cmWXMainFrame.cxx
@@ -521,7 +521,7 @@ void cmMainFrame::ResizeInternal()
}
void cmMainFrame::OnBrowseSource(wxCommandEvent&)
-{
+{
std::string path = this->m_PathSource->GetValue().c_str();
if ( path == "PathSource" )
{
@@ -1193,7 +1193,7 @@ void cmMainFrame::ClearCache()
}
-void cmMainFrame::OnBinaryAccepted(wxCommandEvent& event)
+void cmMainFrame::OnBinaryAccepted(wxCommandEvent&)
{
std::cout << "Pressed enter in binary field" << std::endl;
}
@@ -1308,14 +1308,11 @@ void cmMainFrame::LoadFromRegistry()
}
}
}
-
delete conf;
-
}
void cmMainFrame::SaveToRegistry()
{
-
//wxConfigBase *conf = (wxConfigBase*) wxConfigBase::Get();//new wxConfig("CMakeSetup");
wxConfig *conf = new wxConfig("CMakeSetup");
conf->SetPath("Settings/StartPath");
diff --git a/Source/cmSetCommand.cxx b/Source/cmSetCommand.cxx
index df3240e6ec..f1c3579998 100644
--- a/Source/cmSetCommand.cxx
+++ b/Source/cmSetCommand.cxx
@@ -60,25 +60,28 @@ bool cmSetCommand::InitialPass(std::vector<std::string> const& args)
return true;
}
}
-
+
// look for FORCE argument
if (args.size() > 4 && args[args.size()-1] == "FORCE")
{
force = true;
}
+ std::vector<std::string>::size_type arg4, arg5;
+ arg4 = 4 + (force ? 1 : 0);
+ arg5 = 5 + (force ? 1 : 0);
if(args.size() == 2)
{
// SET (VAR value )
value= args[1];
}
- else if(args.size() == 4 + (force ? 1 : 0))
+ else if(args.size() == arg4)
{
// SET (VAR CACHE TYPE "doc String")
cache = true;
cacheStart = 1;
}
- else if(args.size() == 5 + (force ? 1 : 0))
+ else if(args.size() == arg5)
{
// SET (VAR value CACHE TYPE "doc string")
cache = true;