Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 42 additions & 0 deletions Examples/RTTI/RTTI_component/Examples/Cpp/RTTI_example.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,48 @@ int main()

animal = iter->GetNextAnimal();
assert(animal == nullptr);

// Test GetNextOptionalAnimal - class out parameter with bool return
std::cout << std::endl;
std::cout << "Testing GetNextOptionalAnimal:" << std::endl;
auto iter2 = zoo->Iterator();
PAnimal optionalAnimal;
bool hasError;

hasError = iter2->GetNextOptinalAnimal(optionalAnimal);
assert(hasError == true);
assert(optionalAnimal != nullptr);
std::cout << " Got animal: " << optionalAnimal->Name() << std::endl;
assert(std::dynamic_pointer_cast<CGiraffe>(optionalAnimal) != nullptr);

hasError = iter2->GetNextOptinalAnimal(optionalAnimal);
assert(hasError == true);
assert(optionalAnimal != nullptr);
std::cout << " Got animal: " << optionalAnimal->Name() << std::endl;
assert(std::dynamic_pointer_cast<CTiger>(optionalAnimal) != nullptr);

std::cout << "✓ GetNextOptinalAnimal test passed" << std::endl;

// Test GetNextMandatoryAnimal - class out parameter with bool return
std::cout << std::endl;
std::cout << "Testing GetNextMandatoryAnimal:" << std::endl;
auto iter3 = zoo->Iterator();
PAnimal mandatoryAnimal;

hasError = iter3->GetNextMandatoryAnimal(mandatoryAnimal);
assert(hasError == true);
assert(mandatoryAnimal != nullptr);
std::cout << " Got animal: " << mandatoryAnimal->Name() << std::endl;
assert(std::dynamic_pointer_cast<CGiraffe>(mandatoryAnimal) != nullptr);

hasError = iter3->GetNextMandatoryAnimal(mandatoryAnimal);
assert(hasError == true);
assert(mandatoryAnimal != nullptr);
std::cout << " Got animal: " << mandatoryAnimal->Name() << std::endl;
assert(std::dynamic_pointer_cast<CTiger>(mandatoryAnimal) != nullptr);

std::cout << "✓ GetNextMandatoryAnimal test passed" << std::endl;
std::cout << std::endl;
}
catch (std::exception &e)
{
Expand Down
44 changes: 44 additions & 0 deletions Examples/RTTI/RTTI_component/Examples/CppDynamic/RTTI_example.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,50 @@ int main()
assert(animal == nullptr);

std::cout << "Trace 1" << std::endl;

// Test GetNextOptionalAnimal - class out parameter with bool return
std::cout << std::endl;
std::cout << "Testing GetNextOptinalAnimal:" << std::endl;
auto iter2 = zoo->Iterator();
PAnimal optionalAnimal;
bool hasError;

hasError = iter2->GetNextOptinalAnimal(optionalAnimal);
assert(hasError == true);
assert(optionalAnimal != nullptr);
std::cout << " Got animal: " << optionalAnimal->Name() << std::endl;
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

previously calling optionalAnimal->Name() was not possible, because Base was returned?

assert(std::dynamic_pointer_cast<CGiraffe>(optionalAnimal) != nullptr);

hasError = iter2->GetNextOptinalAnimal(optionalAnimal);
assert(hasError == true);
assert(optionalAnimal != nullptr);
std::cout << " Got animal: " << optionalAnimal->Name() << std::endl;
assert(std::dynamic_pointer_cast<CTiger>(optionalAnimal) != nullptr);

std::cout << "✓ GetNextOptinalAnimal test passed" << std::endl;

// Test GetNextMandatoryAnimal - class out parameter with bool return
std::cout << std::endl;
std::cout << "Testing GetNextMandatoryAnimal:" << std::endl;
auto iter3 = zoo->Iterator();
PAnimal mandatoryAnimal;

hasError = iter3->GetNextMandatoryAnimal(mandatoryAnimal);
assert(hasError == true);
assert(mandatoryAnimal != nullptr);
std::cout << " Got animal: " << mandatoryAnimal->Name() << std::endl;
assert(std::dynamic_pointer_cast<CGiraffe>(mandatoryAnimal) != nullptr);

hasError = iter3->GetNextMandatoryAnimal(mandatoryAnimal);
assert(hasError == true);
assert(mandatoryAnimal != nullptr);
std::cout << " Got animal: " << mandatoryAnimal->Name() << std::endl;
assert(std::dynamic_pointer_cast<CTiger>(mandatoryAnimal) != nullptr);

std::cout << "✓ GetNextMandatoryAnimal test passed" << std::endl;

std::cout << std::endl;
std::cout << "Trace 2" << std::endl;
}
catch (std::exception &e)
{
Expand Down
2 changes: 1 addition & 1 deletion Source/buildimplementationcpp.go
Original file line number Diff line number Diff line change
Expand Up @@ -973,7 +973,7 @@ func buildOutCacheTemplateParameters (method ComponentDefinitionMethod, NameSpac

cppParamType := getCppParamType(param, NameSpace, true);
if param.ParamType == "class" || param.ParamType == "optionalclass" {
cppParamType = fmt.Sprintf("I%s%s*", ClassIdentifier, BaseClassName)
cppParamType = fmt.Sprintf("I%s%s*", ClassIdentifier, param.ParamClass)
}
result += cppParamType;
}
Expand Down
Loading