tcl.git - Tcl is a high-level, general-purpose, interpreted, dynamic programming language. It was designed with the goal of being very simple but powerful.

Tcl is a high-level, general-purpose, interpreted, dynamic programming language. It was designed with the goal of being very simple but powerful.

summary refs log tree commit diff stats

path: root/generic/tclLink.c

diff options

author	hobbs <hobbs>	2005-10-07 22:35:33 (GMT)
committer	hobbs <hobbs>	2005-10-07 22:35:33 (GMT)
commit	98a6fcad96289a40b501fbd2095387a245fd804d (patch)
tree	2c3ff8d55bb409730bc8811c577358f3ba743fb7 /generic/tclLink.c
parent	2a5ae89c4e4c6574518b806cb6e6586823450c5d (diff)
download	tcl-98a6fcad96289a40b501fbd2095387a245fd804d.zip tcl-98a6fcad96289a40b501fbd2095387a245fd804d.tar.gz tcl-98a6fcad96289a40b501fbd2095387a245fd804d.tar.bz2

* unix/tclUnixFCmd.c (TraverseUnixTree): Adjust 2004-11-11 change tomsofer_wcodes_branch_20051007 kennykb_numerics_branch_20051008

* tests/fCmd.test (fCmd-20.2): account for NFS special files with a readdir rewind threshold. [Bug 1034337]

Diffstat (limited to 'generic/tclLink.c')

0 files changed, 0 insertions, 0 deletions

8.4&id=84fdc9921cab35addba8c57cd201778de2cf87a4'>Source/cmComputeLinkDepends.h

@@ -32,7 +32,7 @@ class cmake;

class cmComputeLinkDepends

{

public:

- cmComputeLinkDepends(cmTarget const* target, const char* config,

+ cmComputeLinkDepends(cmTarget const* target, const std::string& config,

cmTarget const* head);

~cmComputeLinkDepends();

@@ -68,7 +68,8 @@ private:

bool DebugMode;

// Configuration information.

- const char* Config;

+ bool HasConfig;

+ std::string Config;

cmTarget::LinkLibraryType LinkType;

// Output information.

diff --git a/Source/cmComputeLinkInformation.cxx b/Source/cmComputeLinkInformation.cxx
index 32b23b8..e4e2047 100644
--- a/Source/cmComputeLinkInformation.cxx
+++ b/Source/cmComputeLinkInformation.cxx

@@ -239,7 +239,7 @@ because this need be done only for shared libraries without soname-s.

//----------------------------------------------------------------------------

cmComputeLinkInformation

-::cmComputeLinkInformation(cmTarget const* target, const char* config,

+::cmComputeLinkInformation(cmTarget const* target, const std::string& config,

cmTarget const* headTarget)

{

// Store context information.

@@ -505,7 +505,8 @@ bool cmComputeLinkInformation::Compute()

}

// Compute the ordered link line items.

- cmComputeLinkDepends cld(this->Target, this->Config, this->HeadTarget);

+ cmComputeLinkDepends cld(this->Target, this->Config.c_str(),

+ this->HeadTarget);

cld.SetOldLinkDirMode(this->OldLinkDirMode);

cmComputeLinkDepends::EntryVector const& linkEntries = cld.Compute();

@@ -624,7 +625,7 @@ void cmComputeLinkInformation::AddItem(std::string const& item,

cmTarget const* tgt)

{

// Compute the proper name to use to link this library.

- const char* config = this->Config;

+ const std::string& config = this->Config;

bool impexe = (tgt && tgt->IsExecutableWithExports());

if(impexe && !this->UseImportLibrary && !this->LoaderFlag)

{

diff --git a/Source/cmComputeLinkInformation.h b/Source/cmComputeLinkInformation.h
index b5a8bec..e345fe2 100644
--- a/Source/cmComputeLinkInformation.h
+++ b/Source/cmComputeLinkInformation.h

@@ -29,7 +29,7 @@ class cmOrderDirectories;

class cmComputeLinkInformation

{

public:

- cmComputeLinkInformation(cmTarget const* target, const char* config,

+ cmComputeLinkInformation(cmTarget const* target, const std::string& config,

cmTarget const* headTarget);

~cmComputeLinkInformation();

bool Compute();

@@ -82,7 +82,7 @@ private:

cmake* CMakeInstance;

// Configuration information.

- const char* Config;

+ std::string Config;

std::string LinkLanguage;

bool LinkDependsNoShared;

diff --git a/Source/cmComputeTargetDepends.cxx b/Source/cmComputeTargetDepends.cxx
index 405643e..10041db 100644
--- a/Source/cmComputeTargetDepends.cxx
+++ b/Source/cmComputeTargetDepends.cxx

@@ -214,7 +214,7 @@ void cmComputeTargetDepends::CollectTargetDepends(int depender_index)

std::set<std::string> emitted;

{

std::vector<std::string> tlibs;

- depender->GetDirectLinkLibraries(0, tlibs, depender);

+ depender->GetDirectLinkLibraries("", tlibs, depender);

// A target should not depend on itself.

emitted.insert(depender->GetName());

for(std::vector<std::string>::const_iterator lib = tlibs.begin();

@@ -274,7 +274,7 @@ void cmComputeTargetDepends::CollectTargetDepends(int depender_index)

//----------------------------------------------------------------------------

void cmComputeTargetDepends::AddInterfaceDepends(int depender_index,

cmTarget const* dependee,

- const char *config,

+ const std::string& config,

std::set<std::string> &emitted)

{

cmTarget const* depender = this->Targets[depender_index];

@@ -317,7 +317,7 @@ void cmComputeTargetDepends::AddInterfaceDepends(int depender_index,

if(dependee)

{

- this->AddInterfaceDepends(depender_index, dependee, 0, emitted);

+ this->AddInterfaceDepends(depender_index, dependee, "", emitted);

std::vector<std::string> configs;

depender->GetMakefile()->GetConfigurations(configs);

for (std::vector<std::string>::const_iterator it = configs.begin();

diff --git a/Source/cmComputeTargetDepends.h b/Source/cmComputeTargetDepends.h
index db76a18..7553816 100644
--- a/Source/cmComputeTargetDepends.h
+++ b/Source/cmComputeTargetDepends.h

@@ -55,7 +55,7 @@ private:

const std::string& dependee_name,

bool linking, std::set<std::string> &emitted);

void AddInterfaceDepends(int depender_index, cmTarget const* dependee,

- const char *config,

+ const std::string& config,

std::set<std::string> &emitted);

cmGlobalGenerator* GlobalGenerator;

bool DebugMode;

diff --git a/Source/cmCoreTryCompile.cxx b/Source/cmCoreTryCompile.cxx


context:
space:
mode: