Update of /cvsroot/pure-data/externals/grh/PDContainer/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13129
Modified Files: h_deque.cpp h_list.cpp h_map.cpp h_multimap.cpp h_multiset.cpp h_prioqueue.cpp h_queue.cpp h_set.cpp h_stack.cpp h_vector.cpp Log Message: fix to support Pd-Extended and also the old buildsystem
Index: h_multiset.cpp =================================================================== RCS file: /cvsroot/pure-data/externals/grh/PDContainer/src/h_multiset.cpp,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** h_multiset.cpp 7 Jan 2007 23:17:45 -0000 1.3 --- h_multiset.cpp 1 Mar 2007 18:06:58 -0000 1.4 *************** *** 206,210 **** }
! extern "C" void h_multiset_setup(void) { // the object class --- 206,215 ---- }
! #if defined(PDCONTAINER_SINGLE_OBJECT) ! // for PD-Extended ! extern "C" { ! #endif ! ! void h_multiset_setup(void) { // the object class *************** *** 245,246 **** --- 250,256 ---- class_addmethod(h_multiset_class, (t_method)h_multiset_help, gensym("help"),A_DEFFLOAT, 0); } + + #if defined(PDCONTAINER_SINGLE_OBJECT) + // for PD-Extended + } + #endif
Index: h_multimap.cpp =================================================================== RCS file: /cvsroot/pure-data/externals/grh/PDContainer/src/h_multimap.cpp,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** h_multimap.cpp 7 Jan 2007 23:17:45 -0000 1.3 --- h_multimap.cpp 1 Mar 2007 18:06:58 -0000 1.4 *************** *** 336,340 **** }
! extern "C" void h_multimap_setup(void) { h_multimap_class = class_new(gensym("h_multimap"), (t_newmethod)h_multimap_new, --- 336,345 ---- }
! #if defined(PDCONTAINER_SINGLE_OBJECT) ! // for PD-Extended ! extern "C" { ! #endif ! ! void h_multimap_setup(void) { h_multimap_class = class_new(gensym("h_multimap"), (t_newmethod)h_multimap_new, *************** *** 382,383 **** --- 387,394 ---- gensym("help"),A_DEFFLOAT, 0); } + + #if defined(PDCONTAINER_SINGLE_OBJECT) + // for PD-Extended + } + #endif +
Index: h_stack.cpp =================================================================== RCS file: /cvsroot/pure-data/externals/grh/PDContainer/src/h_stack.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** h_stack.cpp 7 Jan 2007 23:17:45 -0000 1.2 --- h_stack.cpp 1 Mar 2007 18:06:58 -0000 1.3 *************** *** 137,141 **** }
! extern "C" void h_stack_setup(void) { // the object class --- 137,146 ---- }
! #if defined(PDCONTAINER_SINGLE_OBJECT) ! // for PD-Extended ! extern "C" { ! #endif ! ! void h_stack_setup(void) { // the object class *************** *** 164,165 **** --- 169,175 ---- class_addmethod(h_stack_class, (t_method)h_stack_help, gensym("help"),A_DEFFLOAT, 0); } + + #if defined(PDCONTAINER_SINGLE_OBJECT) + // for PD-Extended + } + #endif
Index: h_prioqueue.cpp =================================================================== RCS file: /cvsroot/pure-data/externals/grh/PDContainer/src/h_prioqueue.cpp,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** h_prioqueue.cpp 9 Jan 2007 21:02:19 -0000 1.4 --- h_prioqueue.cpp 1 Mar 2007 18:06:58 -0000 1.5 *************** *** 217,221 **** }
! extern "C" void h_prioqueue_setup(void) { // the object class --- 217,226 ---- }
! #if defined(PDCONTAINER_SINGLE_OBJECT) ! // for PD-Extended ! extern "C" { ! #endif ! ! void h_prioqueue_setup(void) { // the object class *************** *** 249,250 **** --- 254,260 ---- class_addmethod(h_prioqueue_class, (t_method)h_prioqueue_help, gensym("help"),A_DEFFLOAT, 0); } + + #if defined(PDCONTAINER_SINGLE_OBJECT) + // for PD-Extended + } + #endif
Index: h_deque.cpp =================================================================== RCS file: /cvsroot/pure-data/externals/grh/PDContainer/src/h_deque.cpp,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** h_deque.cpp 7 Jan 2007 23:17:45 -0000 1.3 --- h_deque.cpp 1 Mar 2007 18:06:58 -0000 1.4 *************** *** 539,543 **** }
! extern "C" void h_deque_setup(void) { // the object class --- 539,549 ---- }
! ! #if defined(PDCONTAINER_SINGLE_OBJECT) ! // for PD-Extended ! extern "C" { ! #endif ! ! void h_deque_setup(void) { // the object class *************** *** 603,604 **** --- 609,615 ---- class_addmethod(h_deque_class, (t_method)h_deque_help, gensym("help"),A_DEFFLOAT, 0); } + + #if defined(PDCONTAINER_SINGLE_OBJECT) + // for PD-Extended + } + #endif
Index: h_queue.cpp =================================================================== RCS file: /cvsroot/pure-data/externals/grh/PDContainer/src/h_queue.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** h_queue.cpp 7 Jan 2007 23:17:45 -0000 1.2 --- h_queue.cpp 1 Mar 2007 18:06:58 -0000 1.3 *************** *** 137,141 **** }
! extern "C" void h_queue_setup(void) { // the object class --- 137,146 ---- }
! #if defined(PDCONTAINER_SINGLE_OBJECT) ! // for PD-Extended ! extern "C" { ! #endif ! ! void h_queue_setup(void) { // the object class *************** *** 164,165 **** --- 169,175 ---- class_addmethod(h_queue_class, (t_method)h_queue_help, gensym("help"),A_DEFFLOAT, 0); } + + #if defined(PDCONTAINER_SINGLE_OBJECT) + // for PD-Extended + } + #endif
Index: h_vector.cpp =================================================================== RCS file: /cvsroot/pure-data/externals/grh/PDContainer/src/h_vector.cpp,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** h_vector.cpp 7 Jan 2007 23:17:45 -0000 1.3 --- h_vector.cpp 1 Mar 2007 18:06:58 -0000 1.4 *************** *** 457,461 **** }
! extern "C" void h_vector_setup(void) { // the object class --- 457,466 ---- }
! #if defined(PDCONTAINER_SINGLE_OBJECT) ! // for PD-Extended ! extern "C" { ! #endif ! ! void h_vector_setup(void) { // the object class *************** *** 489,493 **** class_addmethod(h_vector_class, (t_method)h_vector_get_namespace, gensym("getnamespace"), A_DEFFLOAT, 0); ! class_addmethod(h_vector_class, (t_method)h_vector_print, gensym("getall"), A_DEFFLOAT, 0); class_addmethod(h_vector_class, (t_method)h_vector_print, --- 494,498 ---- class_addmethod(h_vector_class, (t_method)h_vector_get_namespace, gensym("getnamespace"), A_DEFFLOAT, 0); ! class_addmethod(h_vector_class, (t_method)h_vector_getall, gensym("getall"), A_DEFFLOAT, 0); class_addmethod(h_vector_class, (t_method)h_vector_print, *************** *** 513,514 **** --- 518,524 ---- class_addmethod(h_vector_class, (t_method)h_vector_help, gensym("help"),A_DEFFLOAT, 0); } + + #if defined(PDCONTAINER_SINGLE_OBJECT) + // for PD-Extended + } + #endif
Index: h_list.cpp =================================================================== RCS file: /cvsroot/pure-data/externals/grh/PDContainer/src/h_list.cpp,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** h_list.cpp 7 Jan 2007 23:17:45 -0000 1.3 --- h_list.cpp 1 Mar 2007 18:06:58 -0000 1.4 *************** *** 394,398 **** }
! extern "C" void h_list_setup(void) { // the object class --- 394,403 ---- }
! #if defined(PDCONTAINER_SINGLE_OBJECT) ! // for PD-Extended ! extern "C" { ! #endif ! ! void h_list_setup(void) { // the object class *************** *** 467,468 **** --- 472,478 ---- class_addmethod(h_list_class, (t_method)h_list_help, gensym("help"),A_DEFFLOAT, 0); } + + #if defined(PDCONTAINER_SINGLE_OBJECT) + // for PD-Extended + } + #endif
Index: h_map.cpp =================================================================== RCS file: /cvsroot/pure-data/externals/grh/PDContainer/src/h_map.cpp,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** h_map.cpp 7 Jan 2007 23:17:45 -0000 1.3 --- h_map.cpp 1 Mar 2007 18:06:58 -0000 1.4 *************** *** 339,343 **** }
! extern "C" void h_map_setup(void) { // the object class --- 339,348 ---- }
! #if defined(PDCONTAINER_SINGLE_OBJECT) ! // for PD-Extended ! extern "C" { ! #endif ! ! void h_map_setup(void) { // the object class *************** *** 385,386 **** --- 390,396 ---- class_addmethod(h_map_class, (t_method)h_map_help, gensym("help"),A_DEFFLOAT, 0); } + + #if defined(PDCONTAINER_SINGLE_OBJECT) + // for PD-Extended + } + #endif
Index: h_set.cpp =================================================================== RCS file: /cvsroot/pure-data/externals/grh/PDContainer/src/h_set.cpp,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** h_set.cpp 7 Jan 2007 23:17:45 -0000 1.3 --- h_set.cpp 1 Mar 2007 18:06:58 -0000 1.4 *************** *** 206,210 **** }
! extern "C" void h_set_setup(void) { // the object class --- 206,215 ---- }
! #if defined(PDCONTAINER_SINGLE_OBJECT) ! // for PD-Extended ! extern "C" { ! #endif ! ! void h_set_setup(void) { // the object class *************** *** 245,246 **** --- 250,256 ---- class_addmethod(h_set_class, (t_method)h_set_help, gensym("help"),A_DEFFLOAT, 0); } + + #if defined(PDCONTAINER_SINGLE_OBJECT) + // for PD-Extended + } + #endif