summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStephen Kelly <steveire@gmail.com>2015-06-07 08:41:16 (GMT)
committerStephen Kelly <steveire@gmail.com>2015-06-07 08:41:47 (GMT)
commit54cb76f299ebcdd07e59d3d0c61f1aa0ffe03a33 (patch)
treec1534f7c205f598ad31c1ff1f371fe26a47d9d6a
parentb661d6c631884e48b27353b0ee9f4f0eb6f5eea7 (diff)
downloadCMake-54cb76f299ebcdd07e59d3d0c61f1aa0ffe03a33.zip
CMake-54cb76f299ebcdd07e59d3d0c61f1aa0ffe03a33.tar.gz
CMake-54cb76f299ebcdd07e59d3d0c61f1aa0ffe03a33.tar.bz2
cmComputeLinkDepends: Re-arrange data layout.
Size goes from 648 to 632 bytes.
-rw-r--r--Source/cmComputeLinkDepends.h18
1 files changed, 7 insertions, 11 deletions
diff --git a/Source/cmComputeLinkDepends.h b/Source/cmComputeLinkDepends.h
index 09b9d70..51a08c5 100644
--- a/Source/cmComputeLinkDepends.h
+++ b/Source/cmComputeLinkDepends.h
@@ -61,14 +61,7 @@ private:
cmMakefile* Makefile;
cmGlobalGenerator const* GlobalGenerator;
cmake* CMakeInstance;
- bool DebugMode;
-
- // Configuration information.
- bool HasConfig;
std::string Config;
- cmTarget::LinkLibraryType LinkType;
-
- // Output information.
EntryVector FinalLinkEntries;
typedef cmTarget::LinkLibraryVectorType LinkLibraryVectorType;
@@ -131,7 +124,7 @@ private:
void OrderLinkEntires();
std::vector<char> ComponentVisited;
std::vector<int> ComponentOrder;
- int ComponentOrderId;
+
struct PendingComponent
{
// The real component id. Needed because the map is indexed by
@@ -158,11 +151,14 @@ private:
// Record of the original link line.
std::vector<int> OriginalEntries;
+ std::set<cmTarget const*> OldWrongConfigItems;
+ void CheckWrongConfigItem(cmLinkItem const& item);
- // Compatibility help.
+ int ComponentOrderId;
+ cmTarget::LinkLibraryType LinkType;
+ bool HasConfig;
+ bool DebugMode;
bool OldLinkDirMode;
- void CheckWrongConfigItem(cmLinkItem const& item);
- std::set<cmTarget const*> OldWrongConfigItems;
};
#endif