diff --git a/Assignments/lab4-Structures_CalebFontenot/cmake-build-debug/.ninja_deps b/Assignments/lab4-Structures_CalebFontenot/cmake-build-debug/.ninja_deps index d3c884d..ecab9c6 100644 Binary files a/Assignments/lab4-Structures_CalebFontenot/cmake-build-debug/.ninja_deps and b/Assignments/lab4-Structures_CalebFontenot/cmake-build-debug/.ninja_deps differ diff --git a/Assignments/lab4-Structures_CalebFontenot/cmake-build-debug/.ninja_log b/Assignments/lab4-Structures_CalebFontenot/cmake-build-debug/.ninja_log index 6d9cc2c..6fca990 100644 --- a/Assignments/lab4-Structures_CalebFontenot/cmake-build-debug/.ninja_log +++ b/Assignments/lab4-Structures_CalebFontenot/cmake-build-debug/.ninja_log @@ -38,3 +38,5 @@ 354 399 1711416497182837945 lab4-Structures_CalebFontenot ed19375c3f47ed34 0 348 1711417298926466164 CMakeFiles/lab4-Structures_CalebFontenot.dir/structures.cpp.o f406e08b6d817e9f 348 422 1711417298998467564 lab4-Structures_CalebFontenot ed19375c3f47ed34 +0 359 1711417885781864949 CMakeFiles/lab4-Structures_CalebFontenot.dir/structures.cpp.o f406e08b6d817e9f +359 416 1711417885837866036 lab4-Structures_CalebFontenot ed19375c3f47ed34 diff --git a/Assignments/lab4-Structures_CalebFontenot/cmake-build-debug/CMakeFiles/lab4-Structures_CalebFontenot.dir/structures.cpp.o b/Assignments/lab4-Structures_CalebFontenot/cmake-build-debug/CMakeFiles/lab4-Structures_CalebFontenot.dir/structures.cpp.o index 2628191..85e0cef 100644 Binary files a/Assignments/lab4-Structures_CalebFontenot/cmake-build-debug/CMakeFiles/lab4-Structures_CalebFontenot.dir/structures.cpp.o and b/Assignments/lab4-Structures_CalebFontenot/cmake-build-debug/CMakeFiles/lab4-Structures_CalebFontenot.dir/structures.cpp.o differ diff --git a/Assignments/lab4-Structures_CalebFontenot/cmake-build-debug/lab4-Structures_CalebFontenot b/Assignments/lab4-Structures_CalebFontenot/cmake-build-debug/lab4-Structures_CalebFontenot index c40b963..b7ad27f 100755 Binary files a/Assignments/lab4-Structures_CalebFontenot/cmake-build-debug/lab4-Structures_CalebFontenot and b/Assignments/lab4-Structures_CalebFontenot/cmake-build-debug/lab4-Structures_CalebFontenot differ diff --git a/Assignments/lab4-Structures_CalebFontenot/structures.cpp b/Assignments/lab4-Structures_CalebFontenot/structures.cpp index 08aefd0..9bcd5e1 100644 --- a/Assignments/lab4-Structures_CalebFontenot/structures.cpp +++ b/Assignments/lab4-Structures_CalebFontenot/structures.cpp @@ -67,7 +67,7 @@ void populate(Employee **pp, int rows, int col ) { std::getline(std::cin, name); printf("Enter salary for %s: ", name.c_str()); std::cin >> salary; - *(*(pp + i) + j) = *new Employee(const_cast(name.c_str()), salary); + pp[i][j] = *new Employee(const_cast(name.c_str()), salary); } } }