summaryrefslogtreecommitdiff
path: root/Source/cmOrderDirectories.cxx
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2016-05-06 14:30:06 -0400
committerBrad King <brad.king@kitware.com>2016-05-09 09:41:43 -0400
commit0ac18d40c8c29a17f1acfcaca506f41a26185901 (patch)
tree88b5d3c4b8c587d7979231d0e6ce9b03b0685a74 /Source/cmOrderDirectories.cxx
parentd95fbdb70944a8f9a7e6ac11bc51f410a99aafcd (diff)
downloadcmake-0ac18d40c8c29a17f1acfcaca506f41a26185901.tar.gz
Remove `//------...` horizontal separator comments
Modern editors provide plenty of ways to visually separate functions. Drop the explicit comments that previously served this purpose. Use the following command to automate the change: $ git ls-files -z -- \ "*.c" "*.cc" "*.cpp" "*.cxx" "*.h" "*.hh" "*.hpp" "*.hxx" | egrep -z -v "^Source/cmCommandArgumentLexer\." | egrep -z -v "^Source/cmCommandArgumentParser(\.y|\.cxx|Tokens\.h)" | egrep -z -v "^Source/cmDependsJavaLexer\." | egrep -z -v "^Source/cmDependsJavaParser(\.y|\.cxx|Tokens\.h)" | egrep -z -v "^Source/cmExprLexer\." | egrep -z -v "^Source/cmExprParser(\.y|\.cxx|Tokens\.h)" | egrep -z -v "^Source/cmFortranLexer\." | egrep -z -v "^Source/cmFortranParser(\.y|\.cxx|Tokens\.h)" | egrep -z -v "^Source/cmListFileLexer\." | egrep -z -v "^Source/cm_sha2" | egrep -z -v "^Source/(kwsys|CursesDialog/form)/" | egrep -z -v "^Utilities/(KW|cm).*/" | xargs -0 sed -i '/^\(\/\/---*\|\/\*---*\*\/\)$/ {d;}' This avoids modifying third-party sources and generated sources.
Diffstat (limited to 'Source/cmOrderDirectories.cxx')
-rw-r--r--Source/cmOrderDirectories.cxx24
1 files changed, 0 insertions, 24 deletions
diff --git a/Source/cmOrderDirectories.cxx b/Source/cmOrderDirectories.cxx
index 2e884e4ff0..a4d9558b13 100644
--- a/Source/cmOrderDirectories.cxx
+++ b/Source/cmOrderDirectories.cxx
@@ -28,7 +28,6 @@ Directory ordering computation.
for shared libraries.
*/
-//----------------------------------------------------------------------------
class cmOrderDirectoriesConstraint
{
public:
@@ -127,7 +126,6 @@ protected:
int DirectoryIndex;
};
-//----------------------------------------------------------------------------
bool cmOrderDirectoriesConstraint::FileMayConflict(std::string const& dir,
std::string const& name)
{
@@ -149,7 +147,6 @@ bool cmOrderDirectoriesConstraint::FileMayConflict(std::string const& dir,
return fi != files.end();
}
-//----------------------------------------------------------------------------
class cmOrderDirectoriesConstraintSOName: public cmOrderDirectoriesConstraint
{
public:
@@ -189,7 +186,6 @@ private:
std::string SOName;
};
-//----------------------------------------------------------------------------
bool cmOrderDirectoriesConstraintSOName::FindConflict(std::string const& dir)
{
// Determine which type of check to do.
@@ -224,7 +220,6 @@ bool cmOrderDirectoriesConstraintSOName::FindConflict(std::string const& dir)
return false;
}
-//----------------------------------------------------------------------------
class cmOrderDirectoriesConstraintLibrary: public cmOrderDirectoriesConstraint
{
public:
@@ -242,7 +237,6 @@ public:
virtual bool FindConflict(std::string const& dir);
};
-//----------------------------------------------------------------------------
bool cmOrderDirectoriesConstraintLibrary::FindConflict(std::string const& dir)
{
// We have the library file name. Check if it will be found.
@@ -276,7 +270,6 @@ bool cmOrderDirectoriesConstraintLibrary::FindConflict(std::string const& dir)
return false;
}
-//----------------------------------------------------------------------------
cmOrderDirectories::cmOrderDirectories(cmGlobalGenerator* gg,
const cmGeneratorTarget* target,
const char* purpose)
@@ -287,14 +280,12 @@ cmOrderDirectories::cmOrderDirectories(cmGlobalGenerator* gg,
this->Computed = false;
}
-//----------------------------------------------------------------------------
cmOrderDirectories::~cmOrderDirectories()
{
cmDeleteAll(this->ConstraintEntries);
cmDeleteAll(this->ImplicitDirEntries);
}
-//----------------------------------------------------------------------------
std::vector<std::string> const& cmOrderDirectories::GetOrderedDirectories()
{
if(!this->Computed)
@@ -307,7 +298,6 @@ std::vector<std::string> const& cmOrderDirectories::GetOrderedDirectories()
return this->OrderedDirectories;
}
-//----------------------------------------------------------------------------
void cmOrderDirectories::AddRuntimeLibrary(std::string const& fullPath,
const char* soname)
{
@@ -353,7 +343,6 @@ void cmOrderDirectories::AddRuntimeLibrary(std::string const& fullPath,
}
}
-//----------------------------------------------------------------------------
void cmOrderDirectories::AddLinkLibrary(std::string const& fullPath)
{
// Link extension info is required for library constraints.
@@ -381,7 +370,6 @@ void cmOrderDirectories::AddLinkLibrary(std::string const& fullPath)
}
}
-//----------------------------------------------------------------------------
void
cmOrderDirectories
::AddUserDirectories(std::vector<std::string> const& extra)
@@ -390,7 +378,6 @@ cmOrderDirectories
extra.begin(), extra.end());
}
-//----------------------------------------------------------------------------
void
cmOrderDirectories
::AddLanguageDirectories(std::vector<std::string> const& dirs)
@@ -399,7 +386,6 @@ cmOrderDirectories
dirs.begin(), dirs.end());
}
-//----------------------------------------------------------------------------
void
cmOrderDirectories
::SetImplicitDirectories(std::set<std::string> const& implicitDirs)
@@ -407,7 +393,6 @@ cmOrderDirectories
this->ImplicitDirectories = implicitDirs;
}
-//----------------------------------------------------------------------------
void
cmOrderDirectories
::SetLinkExtensionInfo(std::vector<std::string> const& linkExtensions,
@@ -417,7 +402,6 @@ cmOrderDirectories
this->RemoveLibraryExtension.compile(removeExtRegex.c_str());
}
-//----------------------------------------------------------------------------
void cmOrderDirectories::CollectOriginalDirectories()
{
// Add user directories specified for inclusion. These should be
@@ -435,7 +419,6 @@ void cmOrderDirectories::CollectOriginalDirectories()
this->AddOriginalDirectories(this->LanguageDirectories);
}
-//----------------------------------------------------------------------------
int cmOrderDirectories::AddOriginalDirectory(std::string const& dir)
{
// Add the runtime directory with a unique index.
@@ -452,7 +435,6 @@ int cmOrderDirectories::AddOriginalDirectory(std::string const& dir)
return i->second;
}
-//----------------------------------------------------------------------------
void
cmOrderDirectories
::AddOriginalDirectories(std::vector<std::string> const& dirs)
@@ -478,7 +460,6 @@ cmOrderDirectories
}
}
-//----------------------------------------------------------------------------
struct cmOrderDirectoriesCompare
{
typedef std::pair<int, int> ConflictPair;
@@ -493,7 +474,6 @@ struct cmOrderDirectoriesCompare
}
};
-//----------------------------------------------------------------------------
void cmOrderDirectories::FindConflicts()
{
// Allocate the conflict graph.
@@ -525,7 +505,6 @@ void cmOrderDirectories::FindConflicts()
this->FindImplicitConflicts();
}
-//----------------------------------------------------------------------------
void cmOrderDirectories::FindImplicitConflicts()
{
// Check for items in implicit link directories that have conflicts
@@ -556,7 +535,6 @@ void cmOrderDirectories::FindImplicitConflicts()
this->Target->GetBacktrace());
}
-//----------------------------------------------------------------------------
void cmOrderDirectories::OrderDirectories()
{
// Allow a cycle to be diagnosed once.
@@ -572,7 +550,6 @@ void cmOrderDirectories::OrderDirectories()
}
}
-//----------------------------------------------------------------------------
void cmOrderDirectories::VisitDirectory(unsigned int i)
{
// Skip nodes already visited.
@@ -603,7 +580,6 @@ void cmOrderDirectories::VisitDirectory(unsigned int i)
this->OrderedDirectories.push_back(this->OriginalDirectories[i]);
}
-//----------------------------------------------------------------------------
void cmOrderDirectories::DiagnoseCycle()
{
// Report the cycle at most once.