support composite build

This commit is contained in:
David Rose 2002-06-06 00:02:57 +00:00
parent 692a1bcf28
commit 5f6c2419fb
2 changed files with 6 additions and 6 deletions

View File

@ -265,9 +265,9 @@ idle() {
// STL function object for sorting labels in order by the collector's
// sort index, used in compute_page(), below.
class SortCollectorLabels {
class SortCollectorLabels1 {
public:
SortCollectorLabels(const PStatClientData *client_data) :
SortCollectorLabels1(const PStatClientData *client_data) :
_client_data(client_data) {
}
bool operator () (int a, int b) const {
@ -315,7 +315,7 @@ compute_page(const PStatFrameData &frame_data) {
}
}
SortCollectorLabels sort_labels(client_data);
SortCollectorLabels1 sort_labels(client_data);
sort(_labels.begin(), _labels.end(), sort_labels);
_labels_changed = true;

View File

@ -439,9 +439,9 @@ idle() {
// STL function object for sorting labels in order by the collector's
// sort index, used in update_labels(), below.
class SortCollectorLabels {
class SortCollectorLabels2 {
public:
SortCollectorLabels(const PStatClientData *client_data) :
SortCollectorLabels2(const PStatClientData *client_data) :
_client_data(client_data) {
}
bool operator () (int a, int b) const {
@ -469,7 +469,7 @@ update_labels() {
_labels.push_back(collector);
}
SortCollectorLabels sort_labels(get_monitor()->get_client_data());
SortCollectorLabels2 sort_labels(get_monitor()->get_client_data());
sort(_labels.begin(), _labels.end(), sort_labels);
int collector = level->get_collector();