projects
/
oota-llvm.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Show command-line args and features passed into backend in debug output. Approved...
[oota-llvm.git]
/
lib
/
Support
/
PluginLoader.cpp
diff --git
a/lib/Support/PluginLoader.cpp
b/lib/Support/PluginLoader.cpp
index ef32af4b3f386c5269f59a7acb16d3582d19866a..36caecffeede769e1d5012b51101f6bcddee61ac 100644
(file)
--- a/
lib/Support/PluginLoader.cpp
+++ b/
lib/Support/PluginLoader.cpp
@@
-14,10
+14,9
@@
#define DONT_GET_PLUGIN_LOADER_OPTION
#include "llvm/Support/ManagedStatic.h"
#include "llvm/Support/PluginLoader.h"
#define DONT_GET_PLUGIN_LOADER_OPTION
#include "llvm/Support/ManagedStatic.h"
#include "llvm/Support/PluginLoader.h"
-#include "llvm/Support/
Streams
.h"
+#include "llvm/Support/
raw_ostream
.h"
#include "llvm/System/DynamicLibrary.h"
#include "llvm/System/Mutex.h"
#include "llvm/System/DynamicLibrary.h"
#include "llvm/System/Mutex.h"
-#include <ostream>
#include <vector>
using namespace llvm;
#include <vector>
using namespace llvm;
@@
-25,23
+24,23
@@
static ManagedStatic<std::vector<std::string> > Plugins;
static ManagedStatic<sys::SmartMutex<true> > PluginsLock;
void PluginLoader::operator=(const std::string &Filename) {
static ManagedStatic<sys::SmartMutex<true> > PluginsLock;
void PluginLoader::operator=(const std::string &Filename) {
- sys::SmartScopedLock<true> Lock(
&
*PluginsLock);
+ sys::SmartScopedLock<true> Lock(*PluginsLock);
std::string Error;
if (sys::DynamicLibrary::LoadLibraryPermanently(Filename.c_str(), &Error)) {
std::string Error;
if (sys::DynamicLibrary::LoadLibraryPermanently(Filename.c_str(), &Error)) {
-
cerr
<< "Error opening '" << Filename << "': " << Error
- << "\n -load request ignored.\n";
+
errs()
<< "Error opening '" << Filename << "': " << Error
+
<< "\n -load request ignored.\n";
} else {
Plugins->push_back(Filename);
}
}
unsigned PluginLoader::getNumPlugins() {
} else {
Plugins->push_back(Filename);
}
}
unsigned PluginLoader::getNumPlugins() {
- sys::SmartScopedLock<true> Lock(
&
*PluginsLock);
+ sys::SmartScopedLock<true> Lock(*PluginsLock);
return Plugins.isConstructed() ? Plugins->size() : 0;
}
std::string &PluginLoader::getPlugin(unsigned num) {
return Plugins.isConstructed() ? Plugins->size() : 0;
}
std::string &PluginLoader::getPlugin(unsigned num) {
- sys::SmartScopedLock<true> Lock(
&
*PluginsLock);
+ sys::SmartScopedLock<true> Lock(*PluginsLock);
assert(Plugins.isConstructed() && num < Plugins->size() &&
"Asking for an out of bounds plugin");
return (*Plugins)[num];
assert(Plugins.isConstructed() && num < Plugins->size() &&
"Asking for an out of bounds plugin");
return (*Plugins)[num];