mirror of
https://github.com/panda3d/panda3d.git
synced 2025-10-04 02:42:49 -04:00
support composite build
This commit is contained in:
parent
692a1bcf28
commit
5f6c2419fb
@ -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;
|
||||
|
@ -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();
|
||||
|
Loading…
x
Reference in New Issue
Block a user