From 26f529d39947219a25b6d967e60132d55b261ee5 Mon Sep 17 00:00:00 2001 From: William S Fulton Date: Sun, 29 Aug 2004 22:27:43 +0000 Subject: missing typename added to keep gcc-3.4 and other ISO compilers happy git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk/SWIG@6171 626c5289-ae23-0410-ae9c-e8d60b6d4f22 --- Examples/test-suite/enum_thorough.i | 46 ++++++++++++++++--------------------- 1 file changed, 20 insertions(+), 26 deletions(-) diff --git a/Examples/test-suite/enum_thorough.i b/Examples/test-suite/enum_thorough.i index 64d75d24c..6e3edd430 100644 --- a/Examples/test-suite/enum_thorough.i +++ b/Examples/test-suite/enum_thorough.i @@ -115,20 +115,20 @@ template struct TemplateClass { enum scientists scientistsTest2(enum scientists e) { return e; } const scientists scientistsTest3(const scientists e) { return e; } const enum scientists scientistsTest4(const enum scientists e) { return e; } - TemplateClass::scientists scientistsTest5(TemplateClass::scientists e) { return e; } - const TemplateClass::scientists scientistsTest6(const TemplateClass::scientists e) { return e; } + typename TemplateClass::scientists scientistsTest5(typename TemplateClass::scientists e) { return e; } + const typename TemplateClass::scientists scientistsTest6(const typename TemplateClass::scientists e) { return e; } enum TemplateClass::scientists scientistsTest7(enum TemplateClass::scientists e) { return e; } const enum TemplateClass::scientists scientistsTest8(const enum TemplateClass::scientists e) { return e; } - TemplateClass::scientists scientistsTest9(TemplateClass::scientists e) { return e; } + typename TemplateClass::scientists scientistsTest9(typename TemplateClass::scientists e) { return e; } // enum TemplateClass::scientists scientistsTestA(enum TemplateClass::scientists e) { return e; } - const TemplateClass::scientists scientistsTestB(const TemplateClass::scientists e) { return e; } + const typename TemplateClass::scientists scientistsTestB(const typename TemplateClass::scientists e) { return e; } // const enum TemplateClass::scientists scientistsTestC(const enum TemplateClass::scientists e) { return e; } scientiststd1 scientistsTestD(scientiststd1 e) { return e; } scientiststd2 scientistsTestE(scientiststd2 e) { return e; } scientiststd3 scientistsTestF(scientiststd3 e) { return e; } - TemplateClass::scientiststd1 scientistsTestG(TemplateClass::scientiststd1 e) { return e; } - TemplateClass::scientiststd2 scientistsTestH(TemplateClass::scientiststd2 e) { return e; } - TemplateClass::scientiststd3 scientistsTestI(TemplateClass::scientiststd3 e) { return e; } + typename TemplateClass::scientiststd1 scientistsTestG(typename TemplateClass::scientiststd1 e) { return e; } + typename TemplateClass::scientiststd2 scientistsTestH(typename TemplateClass::scientiststd2 e) { return e; } + typename TemplateClass::scientiststd3 scientistsTestI(typename TemplateClass::scientiststd3 e) { return e; } }; TemplateClass::scientists scientistsTest1(TemplateClass::scientists e) { return e; } @@ -150,28 +150,28 @@ template struct TClass { enum scientists scientistsNameTest2(enum scientists e) { return e; } const scientists scientistsNameTest3(const scientists e) { return e; } const enum scientists scientistsNameTest4(const enum scientists e) { return e; } - TClass::scientists scientistsNameTest5(TClass::scientists e) { return e; } - const TClass::scientists scientistsNameTest6(const TClass::scientists e) { return e; } + typename TClass::scientists scientistsNameTest5(typename TClass::scientists e) { return e; } + const typename TClass::scientists scientistsNameTest6(const typename TClass::scientists e) { return e; } enum TClass::scientists scientistsNameTest7(enum TClass::scientists e) { return e; } const enum TClass::scientists scientistsNameTest8(const enum TClass::scientists e) { return e; } - TClass::scientists scientistsNameTest9(TClass::scientists e) { return e; } + typename TClass::scientists scientistsNameTest9(typename TClass::scientists e) { return e; } // enum TClass::scientists scientistsNameTestA(enum TClass::scientists e) { return e; } - const TClass::scientists scientistsNameTestB(const TClass::scientists e) { return e; } + const typename TClass::scientists scientistsNameTestB(const typename TClass::scientists e) { return e; } // const enum TClass::scientists scientistsNameTestC(const enum TClass::scientists e) { return e; } scientiststd1 scientistsNameTestD(scientiststd1 e) { return e; } scientiststd2 scientistsNameTestE(scientiststd2 e) { return e; } scientiststd3 scientistsNameTestF(scientiststd3 e) { return e; } - TClass::scientiststd1 scientistsNameTestG(TClass::scientiststd1 e) { return e; } - TClass::scientiststd2 scientistsNameTestH(TClass::scientiststd2 e) { return e; } - TClass::scientiststd3 scientistsNameTestI(TClass::scientiststd3 e) { return e; } + typename TClass::scientiststd1 scientistsNameTestG(typename TClass::scientiststd1 e) { return e; } + typename TClass::scientiststd2 scientistsNameTestH(typename TClass::scientiststd2 e) { return e; } + typename TClass::scientiststd3 scientistsNameTestI(typename TClass::scientiststd3 e) { return e; } - Name::TClass::scientists scientistsNameSpaceTest1(Name::TClass::scientists e) { return e; } - const Name::TClass::scientists scientistsNameSpaceTest2(const Name::TClass::scientists e) { return e; } + typename Name::TClass::scientists scientistsNameSpaceTest1(typename Name::TClass::scientists e) { return e; } + const typename Name::TClass::scientists scientistsNameSpaceTest2(const typename Name::TClass::scientists e) { return e; } enum Name::TClass::scientists scientistsNameSpaceTest3(enum Name::TClass::scientists e) { return e; } const enum Name::TClass::scientists scientistsNameSpaceTest4(const enum Name::TClass::scientists e) { return e; } - Name::TClass::scientiststd1 scientistsNameSpaceTest5(Name::TClass::scientiststd1 e) { return e; } - Name::TClass::scientiststd2 scientistsNameSpaceTest6(Name::TClass::scientiststd2 e) { return e; } - Name::TClass::scientiststd3 scientistsNameSpaceTest7(Name::TClass::scientiststd3 e) { return e; } + typename Name::TClass::scientiststd1 scientistsNameSpaceTest5(typename Name::TClass::scientiststd1 e) { return e; } + typename Name::TClass::scientiststd2 scientistsNameSpaceTest6(typename Name::TClass::scientiststd2 e) { return e; } + typename Name::TClass::scientiststd3 scientistsNameSpaceTest7(typename Name::TClass::scientiststd3 e) { return e; } // Test TemplateClass::scientists rather then TClass::scientists ::TemplateClass::scientists scientistsOtherTest1(::TemplateClass::scientists e) { return e; } @@ -443,19 +443,12 @@ namespace curly { struct Obscure { enum {}; - enum {,}; enum Zero {}; - enum ZeroTrail {,}; enum One {one}; - enum OneTrail {onetrail,}; enum Two {two, twoagain}; - enum TwoTrail {twotrail, twotrailagain,}; typedef enum {}; - typedef enum {,}; typedef enum Empty {}; - typedef enum EmptyTrail {,}; typedef enum {} AlsoEmpty; - typedef enum {,} AlsoEmptyTrail; }; // Unnamed enum instance @@ -468,3 +461,4 @@ struct Instances { %} + -- cgit v1.2.3