diff options
| author | Kristof Beyls <kristof.beyls@arm.com> | 2017-03-31 12:00:24 +0000 |
|---|---|---|
| committer | Kristof Beyls <kristof.beyls@arm.com> | 2017-03-31 12:00:24 +0000 |
| commit | f698a69107e39727d81d2ed1dd51445981adede7 (patch) | |
| tree | 7ab555222e9492555f0167c8cd66343d8785963d /llvm/lib/Support/Windows | |
| parent | 27e0f8bc72b4fbda199bd190b755cb83440696b0 (diff) | |
| download | bcm5719-llvm-f698a69107e39727d81d2ed1dd51445981adede7.tar.gz bcm5719-llvm-f698a69107e39727d81d2ed1dd51445981adede7.zip | |
Do not pollute the namespace in a header file.
llvm-svn: 299203
Diffstat (limited to 'llvm/lib/Support/Windows')
| -rw-r--r-- | llvm/lib/Support/Windows/DynamicLibrary.inc | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/llvm/lib/Support/Windows/DynamicLibrary.inc b/llvm/lib/Support/Windows/DynamicLibrary.inc index 25ecb16b373..709499deeaf 100644 --- a/llvm/lib/Support/Windows/DynamicLibrary.inc +++ b/llvm/lib/Support/Windows/DynamicLibrary.inc @@ -24,7 +24,6 @@ #endif namespace llvm { -using namespace sys; //===----------------------------------------------------------------------===// //=== WARNING: Implementation here must contain only Win32 specific code @@ -51,8 +50,9 @@ ELM_Callback(PCSTR ModuleName, DWORD64 ModuleBase, return TRUE; } -DynamicLibrary DynamicLibrary::getPermanentLibrary(const char *filename, - std::string *errMsg) { +sys::DynamicLibrary +sys::DynamicLibrary::getPermanentLibrary(const char *filename, + std::string *errMsg) { SmartScopedLock<true> lock(*SymbolsMutex); if (!filename) { @@ -92,8 +92,8 @@ DynamicLibrary DynamicLibrary::getPermanentLibrary(const char *filename, return DynamicLibrary(a_handle); } -DynamicLibrary DynamicLibrary::addPermanentLibrary(void *handle, - std::string *errMsg) { +sys::DynamicLibrary +sys::DynamicLibrary::addPermanentLibrary(void *handle, std::string *errMsg) { SmartScopedLock<true> lock(*SymbolsMutex); // If we've already loaded this library, tell the caller. if (!OpenedHandles->insert((HMODULE)handle).second) { @@ -129,7 +129,7 @@ DynamicLibrary DynamicLibrary::addPermanentLibrary(void *handle, #undef INLINE_DEF_SYMBOL1 #undef INLINE_DEF_SYMBOL2 -void* DynamicLibrary::SearchForAddressOfSymbol(const char* symbolName) { +void *sys::DynamicLibrary::SearchForAddressOfSymbol(const char *symbolName) { SmartScopedLock<true> Lock(*SymbolsMutex); // First check symbols added via AddSymbol(). @@ -177,7 +177,7 @@ void* DynamicLibrary::SearchForAddressOfSymbol(const char* symbolName) { return 0; } -void *DynamicLibrary::getAddressOfSymbol(const char *symbolName) { +void *sys::DynamicLibrary::getAddressOfSymbol(const char *symbolName) { if (!isValid()) return NULL; if (Data == &OpenedHandles) |
