sergiotarxz/nuttx
sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source
This commit is contained in:
Gregory Nutt 2017-08-12 12:44:08 -06:00
parent 1f989af845
commit f46482fa78
5 changed files with 74 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
libxx/Kconfig
View File

@ -30,7 +30,6 @@ config CXX_NEWLONG
C++ library routines because the NuttX size_t might not have
the same underlying type as your toolchain's size_t.
comment "LLVM C++ Library (libcxx)"
config LIBCXX

6
libxx/Makefile
View File

@ -1,7 +1,7 @@
############################################################################
# libxx/Makefile
#
# Copyright (C) 2009, 2012, 2016 Gregory Nutt. All rights reserved.
# Copyright (C) 2009, 2012, 2016-2017 Gregory Nutt. All rights reserved.
# Author: Gregory Nutt <gnutt@nuttx.org>
#
# Redistribution and use in source and binary forms, with or without
@ -49,8 +49,8 @@ endif
# because uClibx++ or libcxx will replaces them
ifeq (,$(findstring y,$(CONFIG_UCLIBCXX) $(CONFIG_LIBCXX)))
CXXSRCS += libxx_delete.cxx libxx_deletea.cxx libxx_new.cxx libxx_newa.cxx
CXXSRCS += libxx_stdthrow.cxx
CXXSRCS += libxx_delete.cxx libxx_delete_sized.cxx libxx_deletea.cxx
CXXSRCS +=libxx_new.cxx libxx_newa.cxx libxx_stdthrow.cxx
else
ifeq (,$(findstring y,$(CONFIG_UCLIBCXX_EXCEPTION) $(CONFIG_LIBCXX_EXCEPTION)))
CXXSRCS += libxx_stdthrow.cxx

10
libxx/libxx_delete.cxx
View File

@ -1,5 +1,5 @@
//***************************************************************************
// libxx/libxx_new.cxx
// libxx/libxx_delete.cxx
//
// Copyright (C) 2009, 2013 Gregory Nutt. All rights reserved.
// Author: Gregory Nutt <gnutt@nuttx.org>
@ -41,14 +41,6 @@
#include "libxx.hxx"
//***************************************************************************
// Pre-processor Definitions
//***************************************************************************
//***************************************************************************
// Private Data
//***************************************************************************
//***************************************************************************
// Operators
//***************************************************************************

70
libxx/libxx_delete_sized.cxx Normal file
View File

@ -0,0 +1,70 @@
//***************************************************************************
// libxx/libxx_delete_sized.cxx
//
// Copyright (C) 2007 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
//
// NOTE:
// This should take a type of size_t. But size_t has an unknown underlying
// type. In the nuttx sys/types.h header file, size_t is typed as uint32_t
// (which is determined by architecture-specific logic). But the C++
// compiler may believe that size_t is of a different type resulting in
// compilation errors in the operator. Using the underlying integer type
// instead of size_t seems to resolve the compilation issues. Need to
// REVISIT this.
//
//***************************************************************************
//void operator delete(FAR void *ptr, std::size_t size)
#ifdef CONFIG_CXX_NEWLONG
void *operator delete(FAR void *ptr, unsigned long nbytes)
#else
void *operator delete(FAR void *ptr, unsigned int nbytes)
#endif
{
lib_free(ptr);
}

8
libxx/libxx_new.cxx
View File

@ -43,14 +43,6 @@
#include "libxx.hxx"
//***************************************************************************
// Pre-processor Definitions
//***************************************************************************
//***************************************************************************
// Private Data
//***************************************************************************
//***************************************************************************
// Operators
//***************************************************************************