From 6d097114cfd2d7dca2fd58a16b4c2e5c997a25eb Mon Sep 17 00:00:00 2001 From: kgv Date: Tue, 1 Apr 2014 09:22:36 +0400 Subject: [PATCH] 0024780: Exceptions definition - move generated implementation from cxx to hxx Do not generate .cxx files for exception classes --- src/CPPExt/CPPExt_Exception.cxx | 2 +- src/CPPExt/CPPExt_Template.edl | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/src/CPPExt/CPPExt_Exception.cxx b/src/CPPExt/CPPExt_Exception.cxx index cc2d3ac..a30ddf6 100755 --- a/src/CPPExt/CPPExt_Exception.cxx +++ b/src/CPPExt/CPPExt_Exception.cxx @@ -141,7 +141,7 @@ void CPP_ExceptionClass(const Handle(MS_MetaSchema)& aMeta, outfile->Append(aFile); - CPP_ExceptionDerivated(aMeta,api,aClass,outfile,FullList,Supplement); + ///CPP_ExceptionDerivated(aMeta,api,aClass,outfile,FullList,Supplement); } else { ErrorMsg() << "CPPExt" << "CPP_TransientClass - the class is NULL..." << endm; diff --git a/src/CPPExt/CPPExt_Template.edl b/src/CPPExt/CPPExt_Template.edl index 767a868..c9d10f3 100755 --- a/src/CPPExt/CPPExt_Template.edl +++ b/src/CPPExt/CPPExt_Template.edl @@ -426,8 +426,7 @@ $#include $#include $#include <%Inherits.hxx> $ -$class %Class; -$DEFINE_STANDARD_HANDLE(%Class, %Inherits) +$DEFINE_STANDARD_EXCEPTION(%Class, %Inherits) $ $#if !defined No_Exception && !defined No_%Class $ #define %Class_Raise_if(CONDITION, MESSAGE) \ @@ -436,8 +435,6 @@ $#else $ #define %Class_Raise_if(CONDITION, MESSAGE) $#endif $ -$DEFINE_STANDARD_EXCEPTION(%Class, %Inherits) -$ $#endif // _%Class_HeaderFile @end; -- 2.39.5