diff options
1 files changed, 20 insertions, 21 deletions
| -rw-r--r-- | Big4AndInheritance/Drink.h | 41 |
diff --git a/Big4AndInheritance/Drink.h b/Big4AndInheritance/Drink.h index ffab919..0132e16 100644 --- a/Big4AndInheritance/Drink.h +++ b/Big4AndInheritance/Drink.h @@ -1,21 +1,20 @@ -#include <iostream> -using namespace std; - -class Drink -{ -private: - char* mark; - int ml; - void CopyFrom(const Drink& other); - void Free(); -public: - Drink(); - Drink(const char* mark, int ml); - Drink(const Drink& other); - Drink& operator=(const Drink& other); - ~Drink(); - - void setML(int ml); - int getML() const; - const char* getMark() const; -}; +#include <iostream>
+
+class Drink
+{
+private:
+ char* mark;
+ int ml;
+ void CopyFrom(const Drink& other);
+ void Free();
+public:
+ Drink();
+ Drink(const char* mark, int ml);
+ Drink(const Drink& other);
+ Drink& operator=(const Drink& other);
+ ~Drink();
+
+ void setML(int ml);
+ int getML() const;
+ const char* getMark() const;
+};
\ No newline at end of file |