summaryrefslogtreecommitdiffstats
path: root/Source/cmDynamicLoader.cxx
diff options
context:
space:
mode:
authorKitware Robot <kwrobot@kitware.com>2016-05-16 14:34:04 (GMT)
committerBrad King <brad.king@kitware.com>2016-05-16 20:05:19 (GMT)
commitd9fd2f5402eeaa345691313658e02b51038f570b (patch)
treedca71b9a7e267f4c6300da3eb770415381726785 /Source/cmDynamicLoader.cxx
parent82df6deaafb36cbbfd450202bb20b320f637751a (diff)
downloadCMake-d9fd2f5402eeaa345691313658e02b51038f570b.zip
CMake-d9fd2f5402eeaa345691313658e02b51038f570b.tar.gz
CMake-d9fd2f5402eeaa345691313658e02b51038f570b.tar.bz2
Revise C++ coding style using clang-format
Run the `Utilities/Scripts/clang-format.bash` script to update all our C++ code to a new style defined by `.clang-format`. Use `clang-format` version 3.8. * If you reached this commit for a line in `git blame`, re-run the blame operation starting at the parent of this commit to see older history for the content. * See the parent commit for instructions to rebase a change across this style transition commit.
Diffstat (limited to 'Source/cmDynamicLoader.cxx')
-rw-r--r--Source/cmDynamicLoader.cxx54
1 files changed, 23 insertions, 31 deletions
diff --git a/Source/cmDynamicLoader.cxx b/Source/cmDynamicLoader.cxx
index 944a000..7d0bbdc 100644
--- a/Source/cmDynamicLoader.cxx
+++ b/Source/cmDynamicLoader.cxx
@@ -15,8 +15,7 @@ class cmDynamicLoaderCache
{
public:
~cmDynamicLoaderCache();
- void CacheFile(const char* path,
- const cmsys::DynamicLoader::LibraryHandle&);
+ void CacheFile(const char* path, const cmsys::DynamicLoader::LibraryHandle&);
bool GetCacheFile(const char* path, cmsys::DynamicLoader::LibraryHandle&);
bool FlushCache(const char* path);
void FlushCache();
@@ -33,74 +32,67 @@ cmDynamicLoaderCache::~cmDynamicLoaderCache()
{
}
-void cmDynamicLoaderCache::CacheFile(const char* path,
- const cmsys::DynamicLoader::LibraryHandle& p)
+void cmDynamicLoaderCache::CacheFile(
+ const char* path, const cmsys::DynamicLoader::LibraryHandle& p)
{
cmsys::DynamicLoader::LibraryHandle h;
- if ( this->GetCacheFile(path, h) )
- {
+ if (this->GetCacheFile(path, h)) {
this->FlushCache(path);
- }
+ }
this->CacheMap[path] = p;
}
bool cmDynamicLoaderCache::GetCacheFile(const char* path,
- cmsys::DynamicLoader::LibraryHandle& p)
+ cmsys::DynamicLoader::LibraryHandle& p)
{
- std::map<std::string, cmsys::DynamicLoader::LibraryHandle>::iterator it
- = this->CacheMap.find(path);
- if ( it != this->CacheMap.end() )
- {
+ std::map<std::string, cmsys::DynamicLoader::LibraryHandle>::iterator it =
+ this->CacheMap.find(path);
+ if (it != this->CacheMap.end()) {
p = it->second;
return true;
- }
+ }
return false;
}
bool cmDynamicLoaderCache::FlushCache(const char* path)
{
- std::map<std::string, cmsys::DynamicLoader::LibraryHandle>::iterator it
- = this->CacheMap.find(path);
+ std::map<std::string, cmsys::DynamicLoader::LibraryHandle>::iterator it =
+ this->CacheMap.find(path);
bool ret = false;
- if ( it != this->CacheMap.end() )
- {
+ if (it != this->CacheMap.end()) {
cmsys::DynamicLoader::CloseLibrary(it->second);
this->CacheMap.erase(it);
ret = true;
- }
+ }
return ret;
}
void cmDynamicLoaderCache::FlushCache()
{
- for ( std::map<std::string,
- cmsys::DynamicLoader::LibraryHandle>::iterator it
- = this->CacheMap.begin();
- it != this->CacheMap.end(); it++ )
- {
+ for (std::map<std::string, cmsys::DynamicLoader::LibraryHandle>::iterator
+ it = this->CacheMap.begin();
+ it != this->CacheMap.end(); it++) {
cmsys::DynamicLoader::CloseLibrary(it->second);
- }
+ }
delete cmDynamicLoaderCache::Instance;
cmDynamicLoaderCache::Instance = 0;
}
cmDynamicLoaderCache* cmDynamicLoaderCache::GetInstance()
{
- if ( !cmDynamicLoaderCache::Instance )
- {
+ if (!cmDynamicLoaderCache::Instance) {
cmDynamicLoaderCache::Instance = new cmDynamicLoaderCache;
- }
+ }
return cmDynamicLoaderCache::Instance;
}
cmsys::DynamicLoader::LibraryHandle cmDynamicLoader::OpenLibrary(
- const char* libname )
+ const char* libname)
{
cmsys::DynamicLoader::LibraryHandle lh;
- if ( cmDynamicLoaderCache::GetInstance()->GetCacheFile(libname, lh) )
- {
+ if (cmDynamicLoaderCache::GetInstance()->GetCacheFile(libname, lh)) {
return lh;
- }
+ }
lh = cmsys::DynamicLoader::OpenLibrary(libname);
cmDynamicLoaderCache::GetInstance()->CacheFile(libname, lh);
return lh;