STYLE: Fixed line-too-long.

This commit is contained in:
Brad King 2007-02-07 09:23:41 -05:00
parent fb21ee5ce7
commit 96665eb79d
1 changed files with 6 additions and 3 deletions

View File

@ -23,7 +23,8 @@
#include <ctype.h> // isspace #include <ctype.h> // isspace
#define INCLUDE_REGEX_LINE "^[ \t]*#[ \t]*(include|import)[ \t]*[<\"]([^\">]+)([\">])" #define INCLUDE_REGEX_LINE \
"^[ \t]*#[ \t]*(include|import)[ \t]*[<\"]([^\">]+)([\">])"
#define INCLUDE_REGEX_LINE_MARKER "#IncludeRegexLine: " #define INCLUDE_REGEX_LINE_MARKER "#IncludeRegexLine: "
#define INCLUDE_REGEX_SCAN_MARKER "#IncludeRegexScan: " #define INCLUDE_REGEX_SCAN_MARKER "#IncludeRegexScan: "
@ -45,7 +46,8 @@ cmDependsC::cmDependsC(std::vector<std::string> const& includes,
IncludeRegexComplain(complainRegex), IncludeRegexComplain(complainRegex),
IncludeRegexLineString(INCLUDE_REGEX_LINE_MARKER INCLUDE_REGEX_LINE), IncludeRegexLineString(INCLUDE_REGEX_LINE_MARKER INCLUDE_REGEX_LINE),
IncludeRegexScanString(std::string(INCLUDE_REGEX_SCAN_MARKER)+scanRegex), IncludeRegexScanString(std::string(INCLUDE_REGEX_SCAN_MARKER)+scanRegex),
IncludeRegexComplainString(std::string(INCLUDE_REGEX_COMPLAIN_MARKER)+complainRegex), IncludeRegexComplainString(
std::string(INCLUDE_REGEX_COMPLAIN_MARKER)+complainRegex),
CacheFileName(cacheFileName) CacheFileName(cacheFileName)
{ {
this->ReadCacheFile(); this->ReadCacheFile();
@ -290,7 +292,8 @@ void cmDependsC::ReadCacheFile()
cacheEntry=new cmIncludeLines; cacheEntry=new cmIncludeLines;
this->FileCache[line]=cacheEntry; this->FileCache[line]=cacheEntry;
} }
// file doesn't exist, check that the regular expressions haven't changed // file doesn't exist, check that the regular expressions
// haven't changed
else if (res==false) else if (res==false)
{ {
if (line.find(INCLUDE_REGEX_LINE_MARKER) == 0) if (line.find(INCLUDE_REGEX_LINE_MARKER) == 0)