Roll back my last two commits, valgrind complains.

llvm-svn: 110518
This commit is contained in:
Benjamin Kramer 2010-08-07 13:27:41 +00:00
parent b9525dea59
commit a7d0ccfe7f
2 changed files with 4 additions and 4 deletions

View File

@ -18,6 +18,7 @@
#include "llvm/System/DataTypes.h"
#include "llvm/ADT/StringRef.h"
#include <cassert>
#include <string>
#include <vector>
#include <utility>
@ -164,7 +165,7 @@ struct NamedRegionTimer : public TimeRegion {
class TimerGroup {
std::string Name;
Timer *FirstTimer; // First timer in the group.
std::vector<std::pair<TimeRecord, StringRef> > TimersToPrint;
std::vector<std::pair<TimeRecord, std::string> > TimersToPrint;
TimerGroup **Prev, *Next; // Doubly linked list of TimerGroup's.
TimerGroup(const TimerGroup &TG); // DO NOT IMPLEMENT

View File

@ -20,7 +20,6 @@
#include "llvm/System/Mutex.h"
#include "llvm/System/Process.h"
#include "llvm/ADT/OwningPtr.h"
#include "llvm/ADT/STLExtras.h"
#include "llvm/ADT/StringMap.h"
using namespace llvm;
@ -316,7 +315,7 @@ void TimerGroup::addTimer(Timer &T) {
void TimerGroup::PrintQueuedTimers(raw_ostream &OS) {
// Sort the timers in descending order by amount of time taken.
array_pod_sort(TimersToPrint.begin(), TimersToPrint.end());
std::sort(TimersToPrint.begin(), TimersToPrint.end());
TimeRecord Total;
for (unsigned i = 0, e = TimersToPrint.size(); i != e; ++i)