diff options
| -rw-r--r-- | .vs/in-class-exercise-6-connormcdowell275/v17/.wsuo | bin | 26624 -> 34816 bytes | |||
| -rw-r--r-- | .vs/in-class-exercise-6-connormcdowell275/v17/Browse.VC.db | bin | 10813440 -> 10870784 bytes | |||
| -rw-r--r-- | .vs/slnx.sqlite | bin | 323584 -> 323584 bytes | |||
| -rw-r--r-- | Project1/header.h | 8 | ||||
| -rw-r--r-- | 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 Binary files differindex d178da0..ab16c48 100644 --- a/.vs/in-class-exercise-6-connormcdowell275/v17/.wsuo +++ b/.vs/in-class-exercise-6-connormcdowell275/v17/.wsuo diff --git a/.vs/in-class-exercise-6-connormcdowell275/v17/Browse.VC.db b/.vs/in-class-exercise-6-connormcdowell275/v17/Browse.VC.db Binary files differindex ffefd81..8887dc0 100644 --- a/.vs/in-class-exercise-6-connormcdowell275/v17/Browse.VC.db +++ b/.vs/in-class-exercise-6-connormcdowell275/v17/Browse.VC.db diff --git a/.vs/slnx.sqlite b/.vs/slnx.sqlite Binary files differindex 385474d..4c6bfed 100644 --- a/.vs/slnx.sqlite +++ b/.vs/slnx.sqlite 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 <iostream> -#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; } |