mirror of
https://github.com/projectM-visualizer/projectm.git
synced 2026-03-02 05:25:41 +00:00
- added const correctness to keys in splaytree
- fixed but haven't tested a new alias system in builtin params class git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/personal/carm/dev-1.0@222 6778bc44-b910-0410-a7a0-be141de4315d
This commit is contained in:
@ -80,32 +80,32 @@ CustomWave::CustomWave(int id):id(id)
|
||||
/* Initialize tree data structures */
|
||||
|
||||
if ((this->param_tree =
|
||||
SplayTree<Param>::create_splaytree((int (*)(void*, void*))SplayKeyFunctions::compare_string, (void* (*)(void*))SplayKeyFunctions::copy_string, (void (*)(void*))SplayKeyFunctions::free_string)) == NULL) {
|
||||
SplayTree<Param>::create_splaytree((int (*)(const void*, const void*))SplayKeyFunctions::compare_string, (void* (*)(void*))SplayKeyFunctions::copy_string, (void (*)(void*))SplayKeyFunctions::free_string)) == NULL) {
|
||||
delete(this);
|
||||
abort();
|
||||
}
|
||||
|
||||
if ((this->per_point_eqn_tree =
|
||||
SplayTree<PerPointEqn>::create_splaytree((int (*)(void*, void*))SplayKeyFunctions::compare_int, (void* (*)(void*))SplayKeyFunctions::copy_int, (void (*)(void*))SplayKeyFunctions::free_int)) == NULL) {
|
||||
SplayTree<PerPointEqn>::create_splaytree((int (*)(const void*, const void*))SplayKeyFunctions::compare_int, (void* (*)(void*))SplayKeyFunctions::copy_int, (void (*)(void*))SplayKeyFunctions::free_int)) == NULL) {
|
||||
delete(this);
|
||||
abort();
|
||||
}
|
||||
|
||||
if ((this->per_frame_eqn_tree =
|
||||
SplayTree<PerFrameEqn>::create_splaytree((int (*)(void*, void*))SplayKeyFunctions::compare_int,(void* (*)(void*)) SplayKeyFunctions::copy_int,(void (*)(void*)) SplayKeyFunctions::free_int)) == NULL) {
|
||||
SplayTree<PerFrameEqn>::create_splaytree((int (*)(const void*, const void*))SplayKeyFunctions::compare_int,(void* (*)(void*)) SplayKeyFunctions::copy_int,(void (*)(void*)) SplayKeyFunctions::free_int)) == NULL) {
|
||||
delete(this);
|
||||
abort();
|
||||
}
|
||||
|
||||
if ((this->init_cond_tree =
|
||||
SplayTree<InitCond>::create_splaytree((int (*)(void*, void*))SplayKeyFunctions::compare_string, (void*(*)(void*))SplayKeyFunctions::copy_string,(void (*)(void*)) SplayKeyFunctions::free_string)) == NULL) {
|
||||
SplayTree<InitCond>::create_splaytree((int (*)(const void*, const void*))SplayKeyFunctions::compare_string, (void*(*)(void*))SplayKeyFunctions::copy_string,(void (*)(void*)) SplayKeyFunctions::free_string)) == NULL) {
|
||||
delete(this);
|
||||
/// @bug make exception
|
||||
abort();
|
||||
}
|
||||
|
||||
if ((this->per_frame_init_eqn_tree =
|
||||
SplayTree<InitCond>::create_splaytree((int (*)(void*, void*))SplayKeyFunctions::compare_string, (void*(*)(void*))SplayKeyFunctions::copy_string, (void (*)(void*))SplayKeyFunctions::free_string)) == NULL) {
|
||||
SplayTree<InitCond>::create_splaytree((int (*)(const void*, const void*))SplayKeyFunctions::compare_string, (void*(*)(void*))SplayKeyFunctions::copy_string, (void (*)(void*))SplayKeyFunctions::free_string)) == NULL) {
|
||||
delete(this);
|
||||
/// @bug make exception
|
||||
abort();
|
||||
|
||||
Reference in New Issue
Block a user