C++: Compilation with recent C++ compiler needs an overloaded delete[] operator that includes a size_t size argument.

libxx/Makefile

@@ -50,7 +50,8 @@ endif
 
 ifeq (,$(findstring y,$(CONFIG_UCLIBCXX) $(CONFIG_LIBCXX)))
 CXXSRCS += libxx_delete.cxx libxx_delete_sized.cxx libxx_deletea.cxx
-CXXSRCS +=libxx_new.cxx libxx_newa.cxx libxx_stdthrow.cxx
+CXXSRCS += libxx_deletea_sized.cxx libxx_new.cxx libxx_newa.cxx
+CXXSRCS += libxx_stdthrow.cxx
 else
 ifeq (,$(findstring y,$(CONFIG_UCLIBCXX_EXCEPTION) $(CONFIG_LIBCXX_EXCEPTION)))
 CXXSRCS += libxx_stdthrow.cxx

libxx/libxx_delete_sized.cxx

@@ -61,9 +61,9 @@
 
 //void operator delete(FAR void *ptr, std::size_t size)
 #ifdef CONFIG_CXX_NEWLONG
-void operator delete(FAR void *ptr, unsigned long nbytes)
+void operator delete(FAR void *ptr, unsigned long size)
 #else
-void operator delete(FAR void *ptr, unsigned int nbytes)
+void operator delete(FAR void *ptr, unsigned int size)
 #endif
 {
   lib_free(ptr);

libxx/libxx_deletea.cxx

@@ -1,5 +1,5 @@
 //***************************************************************************
-// libxx/libxx_newa.cxx
+// libxx/libxx_deletea.cxx
 //
 //   Copyright (C) 2009, 2013 Gregory Nutt. All rights reserved.
 //   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -41,20 +41,12 @@
 
 #include "libxx.hxx"
 
-//***************************************************************************
-// Pre-processor Definitions
-//***************************************************************************
-
-//***************************************************************************
-// Private Data
-//***************************************************************************
-
 //***************************************************************************
 // Operators
 //***************************************************************************
 
 //***************************************************************************
-// Name: delete
+// Name: delete[]
 //***************************************************************************
 
 void operator delete[](void *ptr)

libxx/libxx_deletea_sized.cxx

@@ -0,0 +1,60 @@
+//***************************************************************************
+// libxx/libxx_deletea_sized.cxx
+//
+//   Copyright (C) 2017 Gregory Nutt. All rights reserved.
+//   Author: Gregory Nutt <gnutt@nuttx.org>
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+//
+// 1. Redistributions of source code must retain the above copyright
+//    notice, this list of conditions and the following disclaimer.
+// 2. Redistributions in binary form must reproduce the above copyright
+//    notice, this list of conditions and the following disclaimer in
+//    the documentation and/or other materials provided with the
+//    distribution.
+// 3. Neither the name NuttX nor the names of its contributors may be
+//    used to endorse or promote products derived from this software
+//    without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
+// OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+// AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+//***************************************************************************
+
+//***************************************************************************
+// Included Files
+//***************************************************************************
+
+#include <nuttx/config.h>
+
+#include "libxx.hxx"
+
+//***************************************************************************
+// Operators
+//***************************************************************************
+
+//***************************************************************************
+// Name: delete[]
+//***************************************************************************
+
+//void operator delete[](void *ptr std::size_t size)
+#ifdef CONFIG_CXX_NEWLONG
+void operator delete[](FAR void *ptr, unsigned long size)
+#else
+void operator delete[](FAR void *ptr, unsigned int size)
+#endif
+{
+  lib_free(ptr);
+}