From 0d711b8f35474ea0a93fdedf47dd86d0aa102986 Mon Sep 17 00:00:00 2001 From: Connor McDowell Date: Thu, 25 Jan 2024 18:26:39 -0800 Subject: big double check, everything should be working now actually, we're good --- .../v17/.wsuo | Bin 26624 -> 34816 bytes .../v17/Browse.VC.db | Bin 10813440 -> 10870784 bytes .vs/slnx.sqlite | Bin 323584 -> 323584 bytes Project1/header.h | 8 +++++--- Project1/inclass6.cpp | 7 ++++--- 5 files changed, 9 insertions(+), 6 deletions(-) diff --git a/.vs/in-class-exercise-6-connormcdowell275/v17/.wsuo b/.vs/in-class-exercise-6-connormcdowell275/v17/.wsuo index d178da0..ab16c48 100644 Binary files a/.vs/in-class-exercise-6-connormcdowell275/v17/.wsuo and b/.vs/in-class-exercise-6-connormcdowell275/v17/.wsuo differ diff --git a/.vs/in-class-exercise-6-connormcdowell275/v17/Browse.VC.db b/.vs/in-class-exercise-6-connormcdowell275/v17/Browse.VC.db index ffefd81..8887dc0 100644 Binary files a/.vs/in-class-exercise-6-connormcdowell275/v17/Browse.VC.db and b/.vs/in-class-exercise-6-connormcdowell275/v17/Browse.VC.db differ diff --git a/.vs/slnx.sqlite b/.vs/slnx.sqlite index 385474d..4c6bfed 100644 Binary files a/.vs/slnx.sqlite and b/.vs/slnx.sqlite differ diff --git a/Project1/header.h b/Project1/header.h index 46ecf39..a172276 100644 --- a/Project1/header.h +++ b/Project1/header.h @@ -1,4 +1,6 @@ -#pragma once +#ifndef MY_HEADER_FILE_H +#define MY_HEADER_FILE_H + int returnInt(); int sum(int a, int b); @@ -7,6 +9,6 @@ float percentage(int a, int b); float FtoC(int fah); -float CtoF(int cel) +float CtoF(int cel); -# \ No newline at end of file +#endif MY_HEADER_FILE_H \ No newline at end of file diff --git a/Project1/inclass6.cpp b/Project1/inclass6.cpp index 211d467..9f178b6 100644 --- a/Project1/inclass6.cpp +++ b/Project1/inclass6.cpp @@ -5,7 +5,7 @@ #include -#include "helper.h" +#include "header.h" int main() { @@ -15,8 +15,9 @@ int main() std::cout << returnInt() << std::endl; - std::cout << percentage() << std::endl; - std::cout << FotC(0) << std::endl; + std::cout << percentage(45, 78) << std::endl; + std::cout << FtoC(120) << std::endl; + std::cout << CtoF(40) << std::endl; std::cout << returnInt() << std::endl; } -- cgit v1.2.3