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() // This is used only if we are using the explicit set_value()
// interface. // interface.
bool _value_changed; bool _value_changed;
bool _float_value; float _float_value;
public: public:
static void register_with_read_factory(); static void register_with_read_factory();

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

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