From f965aebef5d8d75883cd7f089d756d79a6895a01 Mon Sep 17 00:00:00 2001 From: adhaar-star <59237202+adhaar-star@users.noreply.github.com> Date: Wed, 12 Feb 2020 11:22:09 -0800 Subject: [PATCH 1/6] Correcting the issue and updating repo --- Inventory.cpp | 16 ++++++++++++---- Inventory.h | 2 +- a.out | Bin 0 -> 26936 bytes main.cpp | 2 +- 4 files changed, 14 insertions(+), 6 deletions(-) create mode 100755 a.out diff --git a/Inventory.cpp b/Inventory.cpp index 57964b4..2574e25 100644 --- a/Inventory.cpp +++ b/Inventory.cpp @@ -4,7 +4,7 @@ using std::string; using std::ostream; - + Inventory::Inventory(string name, float price, int count) { m_name = name; @@ -14,13 +14,21 @@ Inventory::Inventory(string name, float price, int count) void Inventory::sell() { + if(m_in_stock>0){ m_in_stock--; } +} ostream& operator<<(ostream& stream, const Inventory& item) { - stream << item.m_name + if(item.m_in_stock==0){ + stream << "Sorry, that item is out of stock"; + } + else{ + stream << item.m_name << " $" << std::fixed << std::setprecision(2) << item.m_price; - return stream; -} \ No newline at end of file + +} +return stream; +} diff --git a/Inventory.h b/Inventory.h index c52d5d8..0531177 100644 --- a/Inventory.h +++ b/Inventory.h @@ -18,4 +18,4 @@ class Inventory friend ostream& operator<<(ostream&, const Inventory&); }; -#endif \ No newline at end of file +#endif diff --git a/a.out b/a.out new file mode 100755 index 0000000000000000000000000000000000000000..168b967ade8d04991359f60074a5900ca8bcd999 GIT binary patch literal 26936 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 L3#zNde((PQmbwrn literal 0 HcmV?d00001 diff --git a/main.cpp b/main.cpp index 236d4ec..dc789c1 100644 --- a/main.cpp +++ b/main.cpp @@ -22,4 +22,4 @@ int main() }while( choice != 'q' && choice != 'Q'); return 0; -} \ No newline at end of file +} From 5f38a56ae3e637113d2599163f061da5f9409f6b Mon Sep 17 00:00:00 2001 From: adhaar-star <59237202+adhaar-star@users.noreply.github.com> Date: Wed, 12 Feb 2020 11:29:47 -0800 Subject: [PATCH 2/6] Updating files for travis --- .travis.yml | 4 ++++ README.md | 1 + 2 files changed, 5 insertions(+) create mode 100644 .travis.yml create mode 100644 README.md diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 0000000..5cf7002 --- /dev/null +++ b/.travis.yml @@ -0,0 +1,4 @@ +language: cpp +os: linux +script: + - g++ *.cpp diff --git a/README.md b/README.md new file mode 100644 index 0000000..a8e829d --- /dev/null +++ b/README.md @@ -0,0 +1 @@ +[![Build Status](https://travis-ci.com/adhaar-star/Inventory.svg?branch=master)](https://travis-ci.com/adhaar-star/Inventory) From 11d540dd94303c6c849954ff85cbd9417c4bb5d1 Mon Sep 17 00:00:00 2001 From: adhaar-star <59237202+adhaar-star@users.noreply.github.com> Date: Tue, 18 Feb 2020 23:16:23 -0800 Subject: [PATCH 3/6] fixes #1 --- Inventory.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/Inventory.cpp b/Inventory.cpp index 2574e25..01c2ef9 100644 --- a/Inventory.cpp +++ b/Inventory.cpp @@ -19,6 +19,7 @@ void Inventory::sell() } } + ostream& operator<<(ostream& stream, const Inventory& item) { if(item.m_in_stock==0){ From cb22e633602e7c37c02b18f31d4fe0c3061154c1 Mon Sep 17 00:00:00 2001 From: adhaar-star <59237202+adhaar-star@users.noreply.github.com> Date: Tue, 18 Feb 2020 23:23:14 -0800 Subject: [PATCH 4/6] fixes #2 --- Inventory.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Inventory.cpp b/Inventory.cpp index 15d0f81..122e60d 100644 --- a/Inventory.cpp +++ b/Inventory.cpp @@ -19,14 +19,13 @@ void Inventory::sell() } } - ostream& operator<<(ostream& stream, const Inventory& item) { if(item.m_in_stock==0){ stream << "Sorry, that item is out of stock"; } else{ - + stream << item.m_name << " $" << std::fixed << std::setprecision(2) << item.m_price; From 5b2721883a7c9e7f5be65028b35ab139108870e5 Mon Sep 17 00:00:00 2001 From: adhaar-star <59237202+adhaar-star@users.noreply.github.com> Date: Wed, 19 Feb 2020 00:08:32 -0800 Subject: [PATCH 5/6] Close #2 --- Inventory.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/Inventory.cpp b/Inventory.cpp index 122e60d..de51c33 100644 --- a/Inventory.cpp +++ b/Inventory.cpp @@ -19,6 +19,7 @@ void Inventory::sell() } } + ostream& operator<<(ostream& stream, const Inventory& item) { if(item.m_in_stock==0){ From 79124cb718f7a7f7fed3eeca918beb65a6f95ee1 Mon Sep 17 00:00:00 2001 From: adhaar-star <59237202+adhaar-star@users.noreply.github.com> Date: Wed, 19 Feb 2020 00:10:05 -0800 Subject: [PATCH 6/6] Close #1 --- Inventory.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/Inventory.cpp b/Inventory.cpp index de51c33..122e60d 100644 --- a/Inventory.cpp +++ b/Inventory.cpp @@ -19,7 +19,6 @@ void Inventory::sell() } } - ostream& operator<<(ostream& stream, const Inventory& item) { if(item.m_in_stock==0){