summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Source/cmGlobalGenerator.cxx4
-rw-r--r--Source/cmGlobalGenerator.h4
-rw-r--r--Source/cmGlobalNinjaGenerator.cxx2
-rw-r--r--Source/cmGlobalNinjaGenerator.h2
-rw-r--r--Source/cmLinkLineComputer.cxx2
-rw-r--r--Source/cmLinkLineComputer.h4
-rw-r--r--Source/cmMSVC60LinkLineComputer.cxx2
-rw-r--r--Source/cmMSVC60LinkLineComputer.h2
-rw-r--r--Source/cmMakefileTargetGenerator.cxx6
-rw-r--r--Source/cmMakefileTargetGenerator.h2
-rw-r--r--Source/cmNinjaLinkLineComputer.cxx2
-rw-r--r--Source/cmNinjaLinkLineComputer.h2
-rw-r--r--Source/cmOutputConverter.cxx2
-rw-r--r--Source/cmOutputConverter.h2
14 files changed, 19 insertions, 19 deletions
diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx
index efa95a5..24a3277 100644
--- a/Source/cmGlobalGenerator.cxx
+++ b/Source/cmGlobalGenerator.cxx
@@ -1415,13 +1415,13 @@ cmGlobalGenerator::CreateQtAutoGeneratorsTargets()
}
cmLinkLineComputer* cmGlobalGenerator::CreateLinkLineComputer(
- cmOutputConverter* outputConverter, cmState::Directory stateDir) const
+ cmOutputConverter* outputConverter, cmStateDirectory stateDir) const
{
return new cmLinkLineComputer(outputConverter, stateDir);
}
cmLinkLineComputer* cmGlobalGenerator::CreateMSVC60LinkLineComputer(
- cmOutputConverter* outputConverter, cmState::Directory stateDir) const
+ cmOutputConverter* outputConverter, cmStateDirectory stateDir) const
{
return new cmMSVC60LinkLineComputer(outputConverter, stateDir);
}
diff --git a/Source/cmGlobalGenerator.h b/Source/cmGlobalGenerator.h
index c3498e0..0f483db 100644
--- a/Source/cmGlobalGenerator.h
+++ b/Source/cmGlobalGenerator.h
@@ -108,10 +108,10 @@ public:
virtual void Generate();
virtual cmLinkLineComputer* CreateLinkLineComputer(
- cmOutputConverter* outputConverter, cmState::Directory stateDir) const;
+ cmOutputConverter* outputConverter, cmStateDirectory stateDir) const;
cmLinkLineComputer* CreateMSVC60LinkLineComputer(
- cmOutputConverter* outputConverter, cmState::Directory stateDir) const;
+ cmOutputConverter* outputConverter, cmStateDirectory stateDir) const;
/**
* Set/Get and Clear the enabled languages.
diff --git a/Source/cmGlobalNinjaGenerator.cxx b/Source/cmGlobalNinjaGenerator.cxx
index 98654c5..a84baca 100644
--- a/Source/cmGlobalNinjaGenerator.cxx
+++ b/Source/cmGlobalNinjaGenerator.cxx
@@ -66,7 +66,7 @@ void cmGlobalNinjaGenerator::WriteComment(std::ostream& os,
}
cmLinkLineComputer* cmGlobalNinjaGenerator::CreateLinkLineComputer(
- cmOutputConverter* outputConverter, cmState::Directory /* stateDir */) const
+ cmOutputConverter* outputConverter, cmStateDirectory /* stateDir */) const
{
return new cmNinjaLinkLineComputer(
outputConverter,
diff --git a/Source/cmGlobalNinjaGenerator.h b/Source/cmGlobalNinjaGenerator.h
index 6b77a2b..d4a14e2 100644
--- a/Source/cmGlobalNinjaGenerator.h
+++ b/Source/cmGlobalNinjaGenerator.h
@@ -72,7 +72,7 @@ public:
cmLinkLineComputer* CreateLinkLineComputer(
cmOutputConverter* outputConverter,
- cmState::Directory stateDir) const CM_OVERRIDE;
+ cmStateDirectory stateDir) const CM_OVERRIDE;
/**
* Write the given @a comment to the output stream @a os. It
diff --git a/Source/cmLinkLineComputer.cxx b/Source/cmLinkLineComputer.cxx
index 5fc861b..f6d5e70 100644
--- a/Source/cmLinkLineComputer.cxx
+++ b/Source/cmLinkLineComputer.cxx
@@ -7,7 +7,7 @@
#include "cmOutputConverter.h"
cmLinkLineComputer::cmLinkLineComputer(cmOutputConverter* outputConverter,
- cmState::Directory stateDir)
+ cmStateDirectory stateDir)
: StateDir(stateDir)
, OutputConverter(outputConverter)
, ForResponse(false)
diff --git a/Source/cmLinkLineComputer.h b/Source/cmLinkLineComputer.h
index 1fb9b24..59e7357 100644
--- a/Source/cmLinkLineComputer.h
+++ b/Source/cmLinkLineComputer.h
@@ -13,7 +13,7 @@ class cmLinkLineComputer
{
public:
cmLinkLineComputer(cmOutputConverter* outputConverter,
- cmState::Directory stateDir);
+ cmStateDirectory stateDir);
virtual ~cmLinkLineComputer();
void SetUseWatcomQuote(bool useWatcomQuote);
@@ -39,7 +39,7 @@ private:
std::string ConvertToOutputFormat(std::string const& input);
std::string ConvertToOutputForExisting(std::string const& input);
- cmState::Directory StateDir;
+ cmStateDirectory StateDir;
cmOutputConverter* OutputConverter;
bool ForResponse;
diff --git a/Source/cmMSVC60LinkLineComputer.cxx b/Source/cmMSVC60LinkLineComputer.cxx
index 2b6df2a..9308d91 100644
--- a/Source/cmMSVC60LinkLineComputer.cxx
+++ b/Source/cmMSVC60LinkLineComputer.cxx
@@ -6,7 +6,7 @@
#include "cmSystemTools.h"
cmMSVC60LinkLineComputer::cmMSVC60LinkLineComputer(
- cmOutputConverter* outputConverter, cmState::Directory stateDir)
+ cmOutputConverter* outputConverter, cmStateDirectory stateDir)
: cmLinkLineComputer(outputConverter, stateDir)
{
}
diff --git a/Source/cmMSVC60LinkLineComputer.h b/Source/cmMSVC60LinkLineComputer.h
index ca9da31..381b8a2 100644
--- a/Source/cmMSVC60LinkLineComputer.h
+++ b/Source/cmMSVC60LinkLineComputer.h
@@ -10,7 +10,7 @@ class cmMSVC60LinkLineComputer : public cmLinkLineComputer
{
public:
cmMSVC60LinkLineComputer(cmOutputConverter* outputConverter,
- cmState::Directory stateDir);
+ cmStateDirectory stateDir);
std::string ConvertToLinkReference(std::string const& input) const
CM_OVERRIDE;
diff --git a/Source/cmMakefileTargetGenerator.cxx b/Source/cmMakefileTargetGenerator.cxx
index f0502bf..97c430f 100644
--- a/Source/cmMakefileTargetGenerator.cxx
+++ b/Source/cmMakefileTargetGenerator.cxx
@@ -1232,7 +1232,7 @@ class cmMakefileTargetGeneratorObjectStrings
public:
cmMakefileTargetGeneratorObjectStrings(std::vector<std::string>& strings,
cmOutputConverter* outputConverter,
- cmState::Directory stateDir,
+ cmStateDirectory stateDir,
std::string::size_type limit)
: Strings(strings)
, OutputConverter(outputConverter)
@@ -1277,7 +1277,7 @@ private:
std::vector<std::string>& Strings;
cmOutputConverter* OutputConverter;
- cmState::Directory StateDir;
+ cmStateDirectory StateDir;
std::string::size_type LengthLimit;
std::string CurrentString;
std::string NextObject;
@@ -1553,7 +1553,7 @@ std::string cmMakefileTargetGenerator::CreateResponseFile(
}
cmLinkLineComputer* cmMakefileTargetGenerator::CreateLinkLineComputer(
- cmOutputConverter* outputConverter, cmState::Directory stateDir)
+ cmOutputConverter* outputConverter, cmStateDirectory stateDir)
{
if (this->Makefile->IsOn("MSVC60")) {
return this->GlobalGenerator->CreateMSVC60LinkLineComputer(outputConverter,
diff --git a/Source/cmMakefileTargetGenerator.h b/Source/cmMakefileTargetGenerator.h
index 4c61011..e44f64a 100644
--- a/Source/cmMakefileTargetGenerator.h
+++ b/Source/cmMakefileTargetGenerator.h
@@ -141,7 +141,7 @@ protected:
std::vector<std::string>& makefile_depends);
cmLinkLineComputer* CreateLinkLineComputer(
- cmOutputConverter* outputConverter, cmState::Directory stateDir);
+ cmOutputConverter* outputConverter, cmStateDirectory stateDir);
/** Create a response file with the given set of options. Returns
the relative path from the target build working directory to the
diff --git a/Source/cmNinjaLinkLineComputer.cxx b/Source/cmNinjaLinkLineComputer.cxx
index 3dcb20b..fa9df6d 100644
--- a/Source/cmNinjaLinkLineComputer.cxx
+++ b/Source/cmNinjaLinkLineComputer.cxx
@@ -5,7 +5,7 @@
#include "cmGlobalNinjaGenerator.h"
cmNinjaLinkLineComputer::cmNinjaLinkLineComputer(
- cmOutputConverter* outputConverter, cmState::Directory stateDir,
+ cmOutputConverter* outputConverter, cmStateDirectory stateDir,
cmGlobalNinjaGenerator const* gg)
: cmLinkLineComputer(outputConverter, stateDir)
, GG(gg)
diff --git a/Source/cmNinjaLinkLineComputer.h b/Source/cmNinjaLinkLineComputer.h
index a108568..daecea4 100644
--- a/Source/cmNinjaLinkLineComputer.h
+++ b/Source/cmNinjaLinkLineComputer.h
@@ -13,7 +13,7 @@ class cmNinjaLinkLineComputer : public cmLinkLineComputer
{
public:
cmNinjaLinkLineComputer(cmOutputConverter* outputConverter,
- cmState::Directory stateDir,
+ cmStateDirectory stateDir,
cmGlobalNinjaGenerator const* gg);
std::string ConvertToLinkReference(std::string const& input) const
diff --git a/Source/cmOutputConverter.cxx b/Source/cmOutputConverter.cxx
index 84a433c..a1228e5 100644
--- a/Source/cmOutputConverter.cxx
+++ b/Source/cmOutputConverter.cxx
@@ -78,7 +78,7 @@ static bool cmOutputConverterNotAbove(const char* a, const char* b)
bool cmOutputConverter::ContainedInDirectory(std::string const& local_path,
std::string const& remote_path,
- cmState::Directory directory)
+ cmStateDirectory directory)
{
const std::string relativePathTopBinary =
directory.GetRelativePathTopBinary();
diff --git a/Source/cmOutputConverter.h b/Source/cmOutputConverter.h
index 71cacab..9e745ec 100644
--- a/Source/cmOutputConverter.h
+++ b/Source/cmOutputConverter.h
@@ -92,7 +92,7 @@ public:
static bool ContainedInDirectory(std::string const& local_path,
std::string const& remote_path,
- cmState::Directory directory);
+ cmStateDirectory directory);
/**
* Convert the given remote path to a relative path with respect to
generated by cgit v0.12 at 2024-11-08 19:02:55 (GMT)