Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 392215 | Differences between
and this patch

Collapse All | Expand All

(-)src/Base/Interpreter.cpp.old (-50 lines)
Lines 503-513 Link Here
503
#if (defined(HAVE_SWIG) && (HAVE_SWIG == 1))
503
#if (defined(HAVE_SWIG) && (HAVE_SWIG == 1))
504
namespace Swig_python { extern int createSWIGPointerObj_T(const char* TypeName, void* obj, PyObject** ptr, int own); }
504
namespace Swig_python { extern int createSWIGPointerObj_T(const char* TypeName, void* obj, PyObject** ptr, int own); }
505
#endif
505
#endif
506
namespace Swig_1_3_25 { extern int createSWIGPointerObj_T(const char* TypeName, void* obj, PyObject** ptr, int own); }
507
namespace Swig_1_3_33 { extern int createSWIGPointerObj_T(const char* TypeName, void* obj, PyObject** ptr, int own); }
508
namespace Swig_1_3_36 { extern int createSWIGPointerObj_T(const char* TypeName, void* obj, PyObject** ptr, int own); }
509
namespace Swig_1_3_38 { extern int createSWIGPointerObj_T(const char* TypeName, void* obj, PyObject** ptr, int own); }
510
namespace Swig_1_3_40 { extern int createSWIGPointerObj_T(const char* TypeName, void* obj, PyObject** ptr, int own); }
511
506
512
PyObject* InterpreterSingleton::createSWIGPointerObj(const char* Module, const char* TypeName, void* Pointer, int own)
507
PyObject* InterpreterSingleton::createSWIGPointerObj(const char* Module, const char* TypeName, void* Pointer, int own)
513
{
508
{
Lines 517-537 Link Here
517
    int version = getSWIGVersionFromModule(Module);
512
    int version = getSWIGVersionFromModule(Module);
518
    switch (version&0xff)
513
    switch (version&0xff)
519
    {
514
    {
520
    case 25:
521
        result = Swig_1_3_25::createSWIGPointerObj_T(TypeName, Pointer, &proxy, own);
522
        break;
523
    case 33:
524
        result = Swig_1_3_33::createSWIGPointerObj_T(TypeName, Pointer, &proxy, own);
525
        break;
526
    case 36:
527
        result = Swig_1_3_36::createSWIGPointerObj_T(TypeName, Pointer, &proxy, own);
528
        break;
529
    case 38:
530
        result = Swig_1_3_38::createSWIGPointerObj_T(TypeName, Pointer, &proxy, own);
531
        break;
532
    case 40:
533
        result = Swig_1_3_40::createSWIGPointerObj_T(TypeName, Pointer, &proxy, own);
534
        break;
535
    default:
515
    default:
536
#if (defined(HAVE_SWIG) && (HAVE_SWIG == 1))
516
#if (defined(HAVE_SWIG) && (HAVE_SWIG == 1))
537
    result = Swig_python::createSWIGPointerObj_T(TypeName, Pointer, &proxy, own);
517
    result = Swig_python::createSWIGPointerObj_T(TypeName, Pointer, &proxy, own);
Lines 550-560 Link Here
550
#if (defined(HAVE_SWIG) && (HAVE_SWIG == 1))
530
#if (defined(HAVE_SWIG) && (HAVE_SWIG == 1))
551
namespace Swig_python { extern int convertSWIGPointerObj_T(const char* TypeName, PyObject* obj, void** ptr, int flags); }
531
namespace Swig_python { extern int convertSWIGPointerObj_T(const char* TypeName, PyObject* obj, void** ptr, int flags); }
552
#endif
532
#endif
553
namespace Swig_1_3_25 { extern int convertSWIGPointerObj_T(const char* TypeName, PyObject* obj, void** ptr, int flags); }
554
namespace Swig_1_3_33 { extern int convertSWIGPointerObj_T(const char* TypeName, PyObject* obj, void** ptr, int flags); }
555
namespace Swig_1_3_36 { extern int convertSWIGPointerObj_T(const char* TypeName, PyObject* obj, void** ptr, int flags); }
556
namespace Swig_1_3_38 { extern int convertSWIGPointerObj_T(const char* TypeName, PyObject* obj, void** ptr, int flags); }
557
namespace Swig_1_3_40 { extern int convertSWIGPointerObj_T(const char* TypeName, PyObject* obj, void** ptr, int flags); }
558
533
559
bool InterpreterSingleton::convertSWIGPointerObj(const char* Module, const char* TypeName, PyObject* obj, void** ptr, int flags)
534
bool InterpreterSingleton::convertSWIGPointerObj(const char* Module, const char* TypeName, PyObject* obj, void** ptr, int flags)
560
{
535
{
Lines 563-583 Link Here
563
    int version = getSWIGVersionFromModule(Module);
538
    int version = getSWIGVersionFromModule(Module);
564
    switch (version&0xff)
539
    switch (version&0xff)
565
    {
540
    {
566
    case 25:
567
        result = Swig_1_3_25::convertSWIGPointerObj_T(TypeName, obj, ptr, flags);
568
        break;
569
    case 33:
570
        result = Swig_1_3_33::convertSWIGPointerObj_T(TypeName, obj, ptr, flags);
571
        break;
572
    case 36:
573
        result = Swig_1_3_36::convertSWIGPointerObj_T(TypeName, obj, ptr, flags);
574
        break;
575
    case 38:
576
        result = Swig_1_3_38::convertSWIGPointerObj_T(TypeName, obj, ptr, flags);
577
        break;
578
    case 40:
579
        result = Swig_1_3_40::convertSWIGPointerObj_T(TypeName, obj, ptr, flags);
580
        break;
581
    default:
541
    default:
582
#if (defined(HAVE_SWIG) && (HAVE_SWIG == 1))
542
#if (defined(HAVE_SWIG) && (HAVE_SWIG == 1))
583
        result = Swig_python::convertSWIGPointerObj_T(TypeName, obj, ptr, flags);
543
        result = Swig_python::convertSWIGPointerObj_T(TypeName, obj, ptr, flags);
Lines 596-606 Link Here
596
#if (defined(HAVE_SWIG) && (HAVE_SWIG == 1))
556
#if (defined(HAVE_SWIG) && (HAVE_SWIG == 1))
597
namespace Swig_python { extern void cleanupSWIG_T(const char* TypeName); }
557
namespace Swig_python { extern void cleanupSWIG_T(const char* TypeName); }
598
#endif
558
#endif
599
namespace Swig_1_3_25 { extern void cleanupSWIG_T(const char* TypeName); }
600
namespace Swig_1_3_33 { extern void cleanupSWIG_T(const char* TypeName); }
601
namespace Swig_1_3_36 { extern void cleanupSWIG_T(const char* TypeName); }
602
namespace Swig_1_3_38 { extern void cleanupSWIG_T(const char* TypeName); }
603
namespace Swig_1_3_40 { extern void cleanupSWIG_T(const char* TypeName); }
604
559
605
void InterpreterSingleton::cleanupSWIG(const char* TypeName)
560
void InterpreterSingleton::cleanupSWIG(const char* TypeName)
606
{
561
{
Lines 608-616 Link Here
608
#if (defined(HAVE_SWIG) && (HAVE_SWIG == 1))
563
#if (defined(HAVE_SWIG) && (HAVE_SWIG == 1))
609
    Swig_python::cleanupSWIG_T(TypeName);
564
    Swig_python::cleanupSWIG_T(TypeName);
610
#endif
565
#endif
611
    Swig_1_3_25::cleanupSWIG_T(TypeName);
612
    Swig_1_3_33::cleanupSWIG_T(TypeName);
613
    Swig_1_3_36::cleanupSWIG_T(TypeName);
614
    Swig_1_3_38::cleanupSWIG_T(TypeName);
615
    Swig_1_3_40::cleanupSWIG_T(TypeName);
616
}
566
}
(-)src/Base/Makefile.am.old (-10 lines)
Lines 65-80 Link Here
65
		Swap.cpp \
65
		Swap.cpp \
66
		swigpyrun.inl \
66
		swigpyrun.inl \
67
		swigpyrun.cpp \
67
		swigpyrun.cpp \
68
		swigpyrun_1.3.25.cpp \
69
		swigpyrun_1.3.25.h \
70
		swigpyrun_1.3.33.cpp \
71
		swigpyrun_1.3.33.h \
72
		swigpyrun_1.3.36.cpp \
73
		swigpyrun_1.3.36.h \
74
		swigpyrun_1.3.38.cpp \
75
		swigpyrun_1.3.38.h \
76
		swigpyrun_1.3.40.cpp \
77
		swigpyrun_1.3.40.h \
78
		TimeInfo.cpp \
68
		TimeInfo.cpp \
79
		Type.cpp \
69
		Type.cpp \
80
		Tools.cpp \
70
		Tools.cpp \

Return to bug 392215