diff --git a/tests/hellopp/hellopp.cpp b/tests/hellopp/hellopp.cpp index adaa55b5..2d14a80f 100644 --- a/tests/hellopp/hellopp.cpp +++ b/tests/hellopp/hellopp.cpp @@ -1,17 +1,10 @@ #include -#include -#include - - -struct Cell { - unsigned int number; -}; struct Location { std::string city; std::string state; int zip; - struct Cell* cell; + unsigned int cell; }; struct Person { @@ -21,46 +14,23 @@ struct Person { struct Location location; }; -void print(const Person& person, const Location& where) { - - std::cout << "'" << person.name << "' from '" << where.city << "'." << std::endl; - std::cout << "'" << person.name << "' from '" << where.city << "'." << std::endl; - std::cout << "'" << person.name << "' from '" << where.city << "'." << std::endl; - std::cout << "'" << person.name << "' from '" << where.city << "'." << std::endl; - std::cout << "'" << person.name << "' from '" << where.city << "'." << std::endl; - std::cout << "'" << person.name << "' from '" << where.city << "'." << std::endl; -} - - int main (int argc, char** argv) { - Person me; Location where; - - me.name = "Pasveer, Ernie"; - me.age = 60; - me.salary = 0.25; - me.location.city = "Houston"; - me.location.state = "Texas"; - me.location.zip = 77063; - me.location.cell = (Cell*)malloc(sizeof(Cell)); - me.location.cell->number = 2226669999; - where.city = "Houston"; where.state = "Texas"; where.zip = 77063; - where.cell = (Cell*)malloc(sizeof(Cell)); - where.cell->number = 2226669999; + where.cell = 2226669999; - std::cout << "'" << me.name << "', from '" << me.location.city << "', is " << me.age << " years old and makes " << me.salary << " per year." << std::endl; - print(me, where); - - free(me.location.cell); - free(where.cell); - - me.location.cell = 0; - where.cell = 0; + Person me; + me.name = "Pasveer, Ernie"; + me.age = 60; + me.salary = 0.25; + me.location.city = "Houston"; + me.location.state = "Texas"; + me.location.zip = 77063; + me.location.cell = 2226669999; return 0; }