diff --git a/ChangeLog.txt b/ChangeLog.txt index 8c4fdd4df..8317f2532 100755 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -198,3 +198,5 @@ keyboard mappings of the Backspace key. Submitted by Mike Smith. * apps/examples/cdcacm: An example that illustrates how the CDC/ACM driver may to connected and disconnected through software control. + * apps/examples/nsh/nsh_main.c: If available, call up_cxxinitialize() to + initialize all statically defined C++ classes. diff --git a/examples/nsh/nsh_main.c b/examples/nsh/nsh_main.c index 5d302e397..1d1592b4d 100644 --- a/examples/nsh/nsh_main.c +++ b/examples/nsh/nsh_main.c @@ -45,6 +45,8 @@ #include #include +#include + #include /**************************************************************************** @@ -84,6 +86,12 @@ int user_start(int argc, char *argv[]) int exitval = 0; int ret; + /* Call all C++ static constructors */ + +#if defined(CONFIG_HAVE_CXX) && defined(CONFIG_HAVE_CXXINITIALIZE) + up_cxxinitialize(); +#endif + /* Initialize the NSH library */ nsh_initialize();