cpplang.hpp

chronolaw · chronolaw · commit 427b5d957c23 · 2020-04-09T21:54:42.000+08:00
diff --git a/section5/SalesData.hpp b/section5/SalesData.hpp
@@ -5,6 +5,8 @@
 
 #include "cpplang.hpp"
 
+BEGIN_NAMESPACE(cpp_study)
+
 class SalesData final
 {
 public:
@@ -15,6 +17,8 @@ class SalesData final
     using uint_type     = unsigned int;
     using currency_type = double;
 
+    static_assert(
+        sizeof(uint_type) >= 4, "uint is too small");
 public:
     SalesData() = default;
    ~SalesData() = default;
@@ -40,12 +44,14 @@ class SalesData final
         return m_revenue;
     }
 
+    CPP_DEPRECATED
     currency_type average() const
     {
         return m_revenue / m_sold;
     }
 };
 
+END_NAMESPACE(cpp_study)
 
 #endif  //_SALES_DATA_HPP
 
diff --git a/section5/cpplang.hpp b/section5/cpplang.hpp
@@ -30,9 +30,10 @@
 // macro for convienient namespace
 #define BEGIN_NAMESPACE(x)  namespace x {
 #define END_NAMESPACE(x)    }
+#define USING_NAMESPACE(x)  using namespace x;
 
-static_assert(
-    __GNUC__ >= 4, "GCC is too old");
+//static_assert(
+//    __GNUC__ >= 4, "GCC is too old");
 
 #endif  //_CPP_LANG_HPP
 

Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,8 @@`
`5`	`5`
`6`	`6`	`#include "cpplang.hpp"`
`7`	`7`
	`8`	`+BEGIN_NAMESPACE(cpp_study)`
	`9`	`+`
`8`	`10`	`class SalesData final`
`9`	`11`	`{`
`10`	`12`	`public:`
`@@ -15,6 +17,8 @@ class SalesData final`
`15`	`17`	`using uint_type = unsigned int;`
`16`	`18`	`using currency_type = double;`
`17`	`19`
	`20`	`+ static_assert(`
	`21`	`+ sizeof(uint_type) >= 4, "uint is too small");`
`18`	`22`	`public:`
`19`	`23`	`SalesData() = default;`
`20`	`24`	`~SalesData() = default;`
`@@ -40,12 +44,14 @@ class SalesData final`
`40`	`44`	`return m_revenue;`
`41`	`45`	`}`
`42`	`46`
	`47`	`+ CPP_DEPRECATED`
`43`	`48`	`currency_type average() const`
`44`	`49`	`{`
`45`	`50`	`return m_revenue / m_sold;`
`46`	`51`	`}`
`47`	`52`	`};`
`48`	`53`
	`54`	`+END_NAMESPACE(cpp_study)`
`49`	`55`
`50`	`56`	`#endif //_SALES_DATA_HPP`
`51`	`57`