TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-10-04 10:54:24 -04:00
Code Issues Packages Projects Releases Wiki Activity

build on win32

Browse Source
This commit is contained in:
David Rose 2003-10-21 04:58:28 +00:00
parent 36638ab984
commit 3141a57b24
2 changed files with 22 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
panda/src/chan/animChannelScalarDynamic.h
View File

@ -60,7 +60,7 @@ private:
// This is used only if we are using the explicit set_value()
// interface.
bool _value_changed;
bool _float_value;
float _float_value;
public:
static void register_with_read_factory();

37
panda/src/chan/animGroup.cxx
View File

@ -156,26 +156,31 @@ make_child_dynamic(const string &name) {
// The new child was appended to the end of our children list
// by its constructor. Reposition it to replace the original
// child.
#ifndef __GNUC__
// There appears to be a compiler bug in gcc 3.2 that causes
// the following not to compile correctly:
(*ci) = new_child;
_children.pop_back();
#else
// I would like to use these lines, but for some reason it
// crashes:
/*
{
(*ci) = new_child;
_children.pop_back();
}
*/
// But this longer way of achieving the same result works
// instead:
Children::iterator nci;
Children new_children;
for (nci = _children.begin(); nci != _children.end(); ++nci) {
if ((*nci) == child) {
new_children.push_back(new_child);
} else if ((*nci) != new_child) {
new_children.push_back(*nci);
{
Children::iterator nci;
Children new_children;
for (nci = _children.begin(); nci != _children.end(); ++nci) {
if ((*nci) == child) {
new_children.push_back(new_child);
} else if ((*nci) != new_child) {
new_children.push_back(*nci);
}
}
new_children.swap(_children);
}
new_children.swap(_children);
new_children.clear();
#endif
return new_child;
}
}