[llvm] r299203 - Do not pollute the namespace in a header file.

Kristof Beyls via llvm-commits llvm-commits at lists.llvm.org
Fri Mar 31 05:00:25 PDT 2017


Author: kbeyls
Date: Fri Mar 31 07:00:24 2017
New Revision: 299203

URL: http://llvm.org/viewvc/llvm-project?rev=299203&view=rev
Log:
Do not pollute the namespace in a header file.

Modified:
    llvm/trunk/lib/Support/Windows/DynamicLibrary.inc

Modified: llvm/trunk/lib/Support/Windows/DynamicLibrary.inc
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Support/Windows/DynamicLibrary.inc?rev=299203&r1=299202&r2=299203&view=diff
==============================================================================
--- llvm/trunk/lib/Support/Windows/DynamicLibrary.inc (original)
+++ llvm/trunk/lib/Support/Windows/DynamicLibrary.inc Fri Mar 31 07:00:24 2017
@@ -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 M
   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::getPerman
   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::addPerman
 #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::SearchForAddressOf
   return 0;
 }
 
-void *DynamicLibrary::getAddressOfSymbol(const char *symbolName) {
+void *sys::DynamicLibrary::getAddressOfSymbol(const char *symbolName) {
   if (!isValid())
     return NULL;
   if (Data == &OpenedHandles)




More information about the llvm-commits mailing list