From f8efccb24f4c39decab465b2e116cf6bdc90c5a2 Mon Sep 17 00:00:00 2001 From: kgv Date: Tue, 8 Apr 2014 14:39:54 +0400 Subject: [PATCH] CPPExt_Packaged - do not include Handle_*.hxx files in Package headers --- src/CPPExt/CPPExt_Package.cxx | 29 +++++++++++++++++++---------- 1 file changed, 19 insertions(+), 10 deletions(-) diff --git a/src/CPPExt/CPPExt_Package.cxx b/src/CPPExt/CPPExt_Package.cxx index f0305d5..520e72e 100755 --- a/src/CPPExt/CPPExt_Package.cxx +++ b/src/CPPExt/CPPExt_Package.cxx @@ -222,16 +222,26 @@ void CPP_Package(const Handle(MS_MetaSchema)& aMeta, api->AddVariable(VSuffix,"hxx"); - for (i = 1; i <= List->Length(); i++) { - if (!List->Value(i)->IsSameString(aPackage->Name())) { - api->AddVariable(VIClass,List->Value(i)->ToCString()); -#ifdef WNT - api->Apply(VTICIncludes,"IncludeNoSafe"); -#else - api->Apply(VTICIncludes,"Include"); -#endif - publics->AssignCat(api->GetVariableValue(VTICIncludes)); + for (i = 1; i <= List->Length(); i++) + { + Handle(TCollection_HAsciiString) aName = List->Value (i); + if (aName->IsSameString (aPackage->Name())) + { + continue; } + + //if (!CPP_HaveHandleHeaders()) + { + aName = CPP_WithoutHandleSuffix (aName); + } + + api->AddVariable (VIClass, aName->ToCString()); + #ifdef _WIN32 + api->Apply(VTICIncludes,"IncludeNoSafe"); + #else + api->Apply(VTICIncludes,"Include"); + #endif + publics->AssignCat (api->GetVariableValue (VTICIncludes)); } for (i = 1; i <= incp->Length(); i++) { @@ -283,4 +293,3 @@ void CPP_Package(const Handle(MS_MetaSchema)& aMeta, Standard_NoSuchObject::Raise(); } } - -- 2.39.5