summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKen Martin <ken.martin@kitware.com>2006-05-10 18:54:46 (GMT)
committerKen Martin <ken.martin@kitware.com>2006-05-10 18:54:46 (GMT)
commita5ed047d4be3f0fbf399813a96e1536e5703b934 (patch)
tree765b748db4d05e77dda6c8d8993339d227e3f1f8
parentd77fbb9640900294e5a32305188c89a3e70e6cc5 (diff)
downloadCMake-a5ed047d4be3f0fbf399813a96e1536e5703b934.zip
CMake-a5ed047d4be3f0fbf399813a96e1536e5703b934.tar.gz
CMake-a5ed047d4be3f0fbf399813a96e1536e5703b934.tar.bz2
STYLE: fix line length
-rw-r--r--Source/cmDepends.h3
-rw-r--r--Source/cmDependsC.cxx11
-rw-r--r--Source/cmDependsFortran.cxx4
-rw-r--r--Source/cmDependsFortranParser.cxx11
4 files changed, 17 insertions, 12 deletions
diff --git a/Source/cmDepends.h b/Source/cmDepends.h
index 80a9c79..ceb78be 100644
--- a/Source/cmDepends.h
+++ b/Source/cmDepends.h
@@ -41,7 +41,8 @@ public:
/** Set the full path to the top of the build tree. This is
the base path from which dependencies are referenced as
relative paths. */
- void SetHomeOutputDirectory(const char *dir) {this->HomeOutputDirectory = dir;};
+ void SetHomeOutputDirectory(const char *dir) {
+ this->HomeOutputDirectory = dir;};
/** should this be verbose in its output */
void SetVerbose(bool verb) { this->Verbose = verb; }
diff --git a/Source/cmDependsC.cxx b/Source/cmDependsC.cxx
index 13ebdcd..ad1d021 100644
--- a/Source/cmDependsC.cxx
+++ b/Source/cmDependsC.cxx
@@ -112,8 +112,8 @@ bool cmDependsC::WriteDependencies(const char *src, const char *obj,
}
else
{
- for(std::vector<std::string>::const_iterator i = this->IncludePath->begin();
- i != this->IncludePath->end(); ++i)
+ for(std::vector<std::string>::const_iterator i =
+ this->IncludePath->begin(); i != this->IncludePath->end(); ++i)
{
// Construct the name of the file as if it were in the current
// include directory. Avoid using a leading "./".
@@ -370,7 +370,8 @@ bool cmDependsC::FileExistsOrIsGenerated(const std::string& fname,
// Note that CMAKE_GENERATED_FILES is written with a conversion
// relative to the home output directory.
std::string rname =
- cmSystemTools::RelativePath(this->HomeOutputDirectory.c_str(), fname.c_str());
+ cmSystemTools::RelativePath(this->HomeOutputDirectory.c_str(),
+ fname.c_str());
if(this->FileIsGenerated(rname, scanned, dependencies))
{
return true;
@@ -387,8 +388,8 @@ bool cmDependsC::FileIsGenerated(const std::string& fname,
std::set<cmStdString>& dependencies)
{
if(this->GeneratedFiles &&
- std::set<cmStdString>::const_iterator(this->GeneratedFiles->find(fname)) !=
- this->GeneratedFiles->end())
+ std::set<cmStdString>::const_iterator(this->GeneratedFiles->find(fname))
+ != this->GeneratedFiles->end())
{
// If the file does not really exist yet pretend it has already
// been scanned. When it exists later then dependencies will be
diff --git a/Source/cmDependsFortran.cxx b/Source/cmDependsFortran.cxx
index 22cff0e..e1ed81c 100644
--- a/Source/cmDependsFortran.cxx
+++ b/Source/cmDependsFortran.cxx
@@ -311,8 +311,8 @@ bool cmDependsFortran::FindIncludeFile(const char* dir,
}
// Search the include path for the file.
- for(std::vector<std::string>::const_iterator i = this->IncludePath->begin();
- i != this->IncludePath->end(); ++i)
+ for(std::vector<std::string>::const_iterator i =
+ this->IncludePath->begin(); i != this->IncludePath->end(); ++i)
{
fullName = *i;
fullName += "/";
diff --git a/Source/cmDependsFortranParser.cxx b/Source/cmDependsFortranParser.cxx
index 42c9953..2f64764 100644
--- a/Source/cmDependsFortranParser.cxx
+++ b/Source/cmDependsFortranParser.cxx
@@ -1,7 +1,7 @@
/* A Bison parser, made by GNU Bison 1.875d. */
-/* Skeleton parser for Yacc-like parsing with Bison,
- Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
+/* Skeleton parser for Yacc-like parsing with Bison, Copyright (C) 1984,
+ 1989, 1990, 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -157,7 +157,9 @@ This file must be translated to C and modified to build everywhere.
Run bison like this:
- bison --yacc --name-prefix=cmDependsFortran_yy --defines=cmDependsFortranParserTokens.h -ocmDependsFortranParser.cxx cmDependsFortranParser.y
+ bison --yacc --name-prefix=cmDependsFortran_yy
+ --defines=cmDependsFortranParserTokens.h -ocmDependsFortranParser.cxx
+ cmDependsFortranParser.y
Modify cmDependsFortranParser.cxx:
- remove TABs
@@ -1387,7 +1389,8 @@ yyerrlab:
YYPOPSTACK;
if (yyssp == yyss)
YYABORT;
- YYDSYMPRINTF ("Error: popping", yystos[*yyssp], yyvsp, yylsp);
+ YYDSYMPRINTF ("Error: popping", yystos[*yyssp],
+ yyvsp, yylsp);
yydestruct (yystos[*yyssp], yyvsp);
}
}