Merging r51923 through r52851 from trunk into soc-2011-tomato

This commit is contained in:
Sergey Sharybin
2012-12-10 15:18:00 +00:00
parent da24aa8d10
commit b1afaa8312
978 changed files with 32475 additions and 17107 deletions

View File

@@ -127,8 +127,8 @@ struct SG_Callbacks
m_schedulefunc(NULL),
m_reschedulefunc(NULL)
{
};
}
SG_Callbacks(
SG_ReplicationNewCallback repfunc,
SG_DestructionNewCallback destructfunc,
@@ -142,7 +142,7 @@ struct SG_Callbacks
m_schedulefunc(schedulefunc),
m_reschedulefunc(reschedulefunc)
{
};
}
SG_ReplicationNewCallback m_replicafunc;
SG_DestructionNewCallback m_destructionfunc;
@@ -152,8 +152,8 @@ struct SG_Callbacks
};
/**
base object that can be part of the scenegraph.
*/
* base object that can be part of the scenegraph.
*/
class SG_IObject : public SG_QList
{
private :