diff options
| author | Stephen Kelly <steveire@gmail.com> | 2015-10-09 21:15:40 (GMT) |
|---|---|---|
| committer | Stephen Kelly <steveire@gmail.com> | 2015-10-14 22:41:22 (GMT) |
| commit | 2ee1cb85e855ce0596e85ef1fc53c5c25cc1465f (patch) | |
| tree | 89d55903e894a1736f99ae19d24ba40f8c33c22b /Source/cmTarget.cxx | |
| parent | a48bcabd33c3d7dcab394e267d4f1b5d21e0d85d (diff) | |
| download | CMake-2ee1cb85e855ce0596e85ef1fc53c5c25cc1465f.zip CMake-2ee1cb85e855ce0596e85ef1fc53c5c25cc1465f.tar.gz CMake-2ee1cb85e855ce0596e85ef1fc53c5c25cc1465f.tar.bz2 | |
cmTarget: Move ImportInfoMap out of internal class.
Diffstat (limited to 'Source/cmTarget.cxx')
| -rw-r--r-- | Source/cmTarget.cxx | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx index 369e497..847a5c1 100644 --- a/Source/cmTarget.cxx +++ b/Source/cmTarget.cxx @@ -64,9 +64,6 @@ const char* cmTarget::GetTargetTypeName(TargetType targetType) class cmTargetInternals { public: - typedef std::map<std::string, cmTarget::ImportInfo> ImportInfoMapType; - ImportInfoMapType ImportInfoMap; - std::vector<std::string> IncludeDirectoriesEntries; std::vector<cmListFileBacktrace> IncludeDirectoriesBacktraces; std::vector<std::string> CompileOptionsEntries; @@ -1538,7 +1535,7 @@ void cmTarget::MaybeInvalidatePropertyCache(const std::string& prop) // Wipe out maps caching information affected by this property. if(this->IsImported() && cmHasLiteralPrefix(prop, "IMPORTED")) { - this->Internal->ImportInfoMap.clear(); + this->ImportInfoMap.clear(); } } @@ -2288,16 +2285,15 @@ cmTarget::GetImportInfo(const std::string& config) const { config_upper = "NOCONFIG"; } - typedef cmTargetInternals::ImportInfoMapType ImportInfoMapType; ImportInfoMapType::const_iterator i = - this->Internal->ImportInfoMap.find(config_upper); - if(i == this->Internal->ImportInfoMap.end()) + this->ImportInfoMap.find(config_upper); + if(i == this->ImportInfoMap.end()) { ImportInfo info; this->ComputeImportInfo(config_upper, info); ImportInfoMapType::value_type entry(config_upper, info); - i = this->Internal->ImportInfoMap.insert(entry).first; + i = this->ImportInfoMap.insert(entry).first; } if(this->GetType() == INTERFACE_LIBRARY) |