Merge remote-tracking branch 'origin/master' into development

LICENSE

@@ -1,8 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2016 jwellbelove
-https://github.com/ETLCPP/etl
-http://www.etlcpp.com
+Copyright (c) 2016 jwellbelove, https://github.com/ETLCPP/etl, http://www.etlcpp.com
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README.md

@@ -1,7 +1,7 @@
 Embedded Template Library (ETL)
 -------------------------
 
-AppVeyor [![Build status](https://ci.appveyor.com/api/projects/status/b7jgecv7unqjw4u0/branch/master?svg=true)](https://ci.appveyor.com/project/jwellbelove/etl/branch/master)
+AppVeyor [![Build status](https://ci.appveyor.com/api/projects/status/b7jgecv7unqjw4u0/branch/master?svg=true)](https://ci.appveyor.com/project/jwellbelove/etl/branch/master) [![License](https://img.shields.io/badge/license-MIT-blue.svg)](https://opensource.org/licenses/MIT)
 
 **Motivation**
 

include/etl/fsm.h

@@ -390,6 +390,10 @@ namespace etl
     }
 
   protected:
+
+    ~fsm_state()
+    {
+    }
 
     inline TContext& get_fsm_context() const
     {
@@ -451,6 +455,10 @@ namespace etl
     }
 
   protected:
+
+    ~fsm_state()
+    {
+    }
 
     inline TContext& get_fsm_context() const
     {
@@ -511,6 +519,10 @@ namespace etl
     }
 
   protected:
+
+    ~fsm_state()
+    {
+    }
 
     inline TContext& get_fsm_context() const
     {
@@ -570,6 +582,10 @@ namespace etl
     }
 
   protected:
+
+    ~fsm_state()
+    {
+    }
 
     inline TContext& get_fsm_context() const
     {
@@ -627,6 +643,10 @@ namespace etl
     }
 
   protected:
+
+    ~fsm_state()
+    {
+    }
 
     inline TContext& get_fsm_context() const
     {
@@ -683,6 +703,10 @@ namespace etl
     }
 
   protected:
+
+    ~fsm_state()
+    {
+    }
 
     inline TContext& get_fsm_context() const
     {
@@ -738,6 +762,10 @@ namespace etl
     }
 
   protected:
+
+    ~fsm_state()
+    {
+    }
 
     inline TContext& get_fsm_context() const
     {
@@ -792,6 +820,10 @@ namespace etl
     }
 
   protected:
+
+    ~fsm_state()
+    {
+    }
 
     inline TContext& get_fsm_context() const
     {
@@ -844,6 +876,10 @@ namespace etl
     }
 
   protected:
+
+    ~fsm_state()
+    {
+    }
 
     inline TContext& get_fsm_context() const
     {
@@ -895,6 +931,10 @@ namespace etl
     }
 
   protected:
+
+    ~fsm_state()
+    {
+    }
 
     inline TContext& get_fsm_context() const
     {
@@ -945,6 +985,10 @@ namespace etl
     }
 
   protected:
+
+    ~fsm_state()
+    {
+    }
 
     inline TContext& get_fsm_context() const
     {
@@ -994,6 +1038,10 @@ namespace etl
     }
 
   protected:
+
+    ~fsm_state()
+    {
+    }
 
     inline TContext& get_fsm_context() const
     {
@@ -1041,6 +1089,10 @@ namespace etl
     }
 
   protected:
+
+    ~fsm_state()
+    {
+    }
 
     inline TContext& get_fsm_context() const
     {
@@ -1087,6 +1139,10 @@ namespace etl
     }
 
   protected:
+
+    ~fsm_state()
+    {
+    }
 
     inline TContext& get_fsm_context() const
     {
@@ -1132,6 +1188,10 @@ namespace etl
     }
 
   protected:
+
+    ~fsm_state()
+    {
+    }
 
     inline TContext& get_fsm_context() const
     {
@@ -1176,6 +1236,10 @@ namespace etl
     }
 
   protected:
+
+    ~fsm_state()
+    {
+    }
 
     inline TContext& get_fsm_context() const
     {
@@ -1216,6 +1280,12 @@ namespace etl
       : ifsm_state(STATE_ID)
     {
     }
+
+  protected:
+
+    ~fsm_state()
+    {
+    }
 
     inline TContext& get_fsm_context() const
     {

include/etl/fsm_generator.h

@@ -411,6 +411,10 @@ namespace etl
   cog.outl("")
   cog.outl("protected:")
   cog.outl("")
+  cog.outl("  ~fsm_state()")
+  cog.outl("  {")
+  cog.outl("  }")
+  cog.outl("")
   cog.outl("  inline TContext& get_fsm_context() const")
   cog.outl("  {")
   cog.outl("    return static_cast<TContext&>(ifsm_state::get_fsm_context());")
@@ -484,6 +488,10 @@ namespace etl
       cog.outl("")
       cog.outl("protected:")
       cog.outl("")
+      cog.outl("  ~fsm_state()")
+      cog.outl("  {")
+      cog.outl("  }")
+      cog.outl("")
       cog.outl("  inline TContext& get_fsm_context() const")
       cog.outl("  {")
       cog.outl("    return static_cast<TContext&>(ifsm_state::get_fsm_context());")
@@ -538,6 +546,12 @@ namespace etl
   cog.outl("  {")
   cog.outl("  }")
   cog.outl("")
+  cog.outl("protected:")
+  cog.outl("")
+  cog.outl("  ~fsm_state()")
+  cog.outl("  {")
+  cog.outl("  }")
+  cog.outl("")
   cog.outl("  inline TContext& get_fsm_context() const")
   cog.outl("  {")
   cog.outl("    return static_cast<TContext&>(ifsm_state::get_fsm_context());")

include/etl/observer.h

@@ -179,6 +179,12 @@ namespace etl
       }
     }
 
+  protected:
+
+    ~observable()
+    {
+    }
+
   private:
 
     /// The list of observers.

library.properties

@@ -2,6 +2,7 @@ name=Embedded Template Library
 version=10.21.2
 author= John Wellbelove <[email protected]>
 maintainer=John Wellbelove <[email protected]>
+license=MIT
 sentence=A C++ template library tailored for embedded systems.
 paragraph=Requires some support from STL. See http://andybrown.me.uk/2011/01/15/the-standard-template-library-stl-for-avr-with-c-streams/ or https://github.com/mike-matera/ArduinoSTL.git for Arduino.
 category=Other