v4.6.2

GorgonMeducer · May 12, 2022 · f057e72 · f057e72
1 parent 6875a80
commit f057e72
Show file tree

Hide file tree

Showing 8 changed files with 26 additions and 18 deletions.
diff --git a/GorgonMeducer.PLOOC.pdsc b/GorgonMeducer.PLOOC.pdsc
@@ -16,19 +16,22 @@
   <repository type="git">https://github.com/GorgonMeducer/PLOOC.git</repository>
 
   <releases>
-    <release date="2022-01-02" version="4.6.1" url="https://raw.githubusercontent.com/GorgonMeducer/PLOOC/master/cmsis-pack/GorgonMeducer.PLOOC.4.6.1.pack">
+    <release date="2022-05-12" version="4.6.2" url="https://raw.githubusercontent.com/GorgonMeducer/PLOOC/master/cmsis-pack/GorgonMeducer.PLOOC.4.6.2.pack">
+      - Improve compatibility with the latest C++
+    </release>
+    <release date="2022-01-02" version="4.6.1" url="https://github.com/GorgonMeducer/PLOOC/raw/64992d6626c828aecec5c0e8aa2cdfd2dca98721/cmsis-pack/GorgonMeducer.PLOOC.4.6.1.pack">
       -  Add helper macros for heap
           - Add __new_class and __free_class for using malloc and free together with constructors and destructors, i.e. xxxx_init() and xxxx_depose().
       - Update example project
       - Other minor update
     </release>
-    <release date="2021-12-30" version="4.6.0" url="https://raw.githubusercontent.com/GorgonMeducer/PLOOC/master/cmsis-pack/GorgonMeducer.PLOOC.4.6.0.pack">
+    <release date="2021-12-30" version="4.6.0" url="https://github.com/GorgonMeducer/PLOOC/raw/d767b581e5116364d5b0fdbff6f5596c75955b22/cmsis-pack/GorgonMeducer.PLOOC.4.6.0.pack">
       - Improving CMSIS-Pack
          - Add example
          - Add code template for base class and derived class
       - Other minor update
     </release>
-    <release date="2021-12-29" version="4.5.9" url="https://raw.githubusercontent.com/GorgonMeducer/PLOOC/master/cmsis-pack/GorgonMeducer.PLOOC.4.5.9.pack">
+    <release date="2021-12-29" version="4.5.9" url="https://github.com/GorgonMeducer/PLOOC/raw/e20695f36153aa6188b50721dfc12c9a731d7792/cmsis-pack/GorgonMeducer.PLOOC.4.5.9.pack">
       - Add CMSIS-Pack
       - Other minor update
     </release>
@@ -84,15 +87,15 @@
   -->
 
     <components>
-        <component Cclass="Language Extension" Cgroup="PLOOC" Cversion="4.6.1">
+        <component Cclass="Language Extension" Cgroup="PLOOC" Cversion="4.6.2">
           <description>A low-overhead OOPC template.</description>
           <files>
             <file category="header"     name="plooc.h"/>
             <file category="header"     name="plooc_class.h"/>
-            <file category="header" name="template/class/class_name.h" attr="template" select="Base Class Template"/>
-            <file category="source" name="template/class/class_name.c" attr="template" select="Base Class Template"/>
-            <file category="header" name="template/derived_class/class_name.h" attr="template" select="Derived Class Template"/>
-            <file category="source" name="template/derived_class/class_name.c" attr="template" select="Derived Class Template"/>
+            <file category="header"     name="template/class/class_name.h"          attr="template" select="Base Class Template"/>
+            <file category="source"     name="template/class/class_name.c"          attr="template" select="Base Class Template"/>
+            <file category="header"     name="template/derived_class/class_name.h"  attr="template" select="Derived Class Template"/>
+            <file category="source"     name="template/derived_class/class_name.c"  attr="template" select="Derived Class Template"/>
           </files>
         </component>
     </components>

diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-# PLOOC (Protected Low-overhead Object Oriented programming with ANSI-C) v4.6.1
+# PLOOC (Protected Low-overhead Object Oriented programming with ANSI-C) v4.6.2
 
 ## Introduction
 ---
@@ -77,6 +77,8 @@ If you have any questions or suggestions, please feel free to let us know.
 
 ## Update Log
 ---
+- \[12/05/2022\] Improve compatibility with the latest C++ language, version 4.6.2
+
 - \[02/01/2022\] Add helper macros for heap, version 4.6.1
     - Add ***\_\_new_class()*** and ***\_\_free_class()*** for using malloc and free together with constructors and destructors, i.e. ***xxxx_init()*** and ***xxxx_depose()***.
     - Update example project

diff --git a/cmsis-pack/GorgonMeducer.PLOOC.4.5.9.pack b/cmsis-pack/GorgonMeducer.PLOOC.4.5.9.pack
diff --git a/cmsis-pack/GorgonMeducer.PLOOC.4.6.0.pack b/cmsis-pack/GorgonMeducer.PLOOC.4.6.0.pack
diff --git a/cmsis-pack/GorgonMeducer.PLOOC.4.6.1.pack b/cmsis-pack/GorgonMeducer.PLOOC.4.6.1.pack
diff --git a/cmsis-pack/GorgonMeducer.PLOOC.4.6.2.pack b/cmsis-pack/GorgonMeducer.PLOOC.4.6.2.pack
diff --git a/cmsis-pack/GorgonMeducer.PLOOC.pdsc b/cmsis-pack/GorgonMeducer.PLOOC.pdsc
@@ -16,19 +16,22 @@
   <repository type="git">https://github.com/GorgonMeducer/PLOOC.git</repository>
 
   <releases>
-    <release date="2022-01-02" version="4.6.1" url="https://raw.githubusercontent.com/GorgonMeducer/PLOOC/master/cmsis-pack/GorgonMeducer.PLOOC.4.6.1.pack">
+    <release date="2022-05-12" version="4.6.2" url="https://raw.githubusercontent.com/GorgonMeducer/PLOOC/master/cmsis-pack/GorgonMeducer.PLOOC.4.6.2.pack">
+      - Improve compatibility with the latest C++
+    </release>
+    <release date="2022-01-02" version="4.6.1" url="https://github.com/GorgonMeducer/PLOOC/raw/64992d6626c828aecec5c0e8aa2cdfd2dca98721/cmsis-pack/GorgonMeducer.PLOOC.4.6.1.pack">
       -  Add helper macros for heap
           - Add __new_class and __free_class for using malloc and free together with constructors and destructors, i.e. xxxx_init() and xxxx_depose().
       - Update example project
       - Other minor update
     </release>
-    <release date="2021-12-30" version="4.6.0" url="https://raw.githubusercontent.com/GorgonMeducer/PLOOC/master/cmsis-pack/GorgonMeducer.PLOOC.4.6.0.pack">
+    <release date="2021-12-30" version="4.6.0" url="https://github.com/GorgonMeducer/PLOOC/raw/d767b581e5116364d5b0fdbff6f5596c75955b22/cmsis-pack/GorgonMeducer.PLOOC.4.6.0.pack">
       - Improving CMSIS-Pack
          - Add example
          - Add code template for base class and derived class
       - Other minor update
     </release>
-    <release date="2021-12-29" version="4.5.9" url="https://raw.githubusercontent.com/GorgonMeducer/PLOOC/master/cmsis-pack/GorgonMeducer.PLOOC.4.5.9.pack">
+    <release date="2021-12-29" version="4.5.9" url="https://github.com/GorgonMeducer/PLOOC/raw/e20695f36153aa6188b50721dfc12c9a731d7792/cmsis-pack/GorgonMeducer.PLOOC.4.5.9.pack">
       - Add CMSIS-Pack
       - Other minor update
     </release>
@@ -84,15 +87,15 @@
   -->
 
     <components>
-        <component Cclass="Language Extension" Cgroup="PLOOC" Cversion="4.6.1">
+        <component Cclass="Language Extension" Cgroup="PLOOC" Cversion="4.6.2">
           <description>A low-overhead OOPC template.</description>
           <files>
             <file category="header"     name="plooc.h"/>
             <file category="header"     name="plooc_class.h"/>
-            <file category="header" name="template/class/class_name.h" attr="template" select="Base Class Template"/>
-            <file category="source" name="template/class/class_name.c" attr="template" select="Base Class Template"/>
-            <file category="header" name="template/derived_class/class_name.h" attr="template" select="Derived Class Template"/>
-            <file category="source" name="template/derived_class/class_name.c" attr="template" select="Derived Class Template"/>
+            <file category="header"     name="template/class/class_name.h"          attr="template" select="Base Class Template"/>
+            <file category="source"     name="template/class/class_name.c"          attr="template" select="Base Class Template"/>
+            <file category="header"     name="template/derived_class/class_name.h"  attr="template" select="Derived Class Template"/>
+            <file category="source"     name="template/derived_class/class_name.c"  attr="template" select="Derived Class Template"/>
           </files>
         </component>
     </components>

diff --git a/plooc.h b/plooc.h
@@ -148,7 +148,7 @@ extern "C" {
 
 //! \brief macro for inheritance
 
-#if (!defined(__STDC_VERSION__) || __STDC_VERSION__ < 199901L) && !defined(__cplusplus)
+#if !defined(__STDC_VERSION__) || __STDC_VERSION__ < 199901L
 #define __IMPLEMENT_EX(__TYPE, __NAME)                                          \
             __TYPE  __NAME;                                                 
 #else