Move c++ operators back to link-time resolutions, part of 'core'

This reverts commit e9b1df5cb5.
This commit is contained in:
Angus Gratton 2015-08-26 11:07:06 +10:00
parent c565e2b90d
commit 43ecec5470
4 changed files with 29 additions and 77 deletions

View file

@ -0,0 +1,25 @@
/* Part of esp-open-rtos
* BSD Licensed as described in the file LICENSE
*/
#include <stdio.h>
#include <stdlib.h>
void *operator new(size_t size)
{
return malloc(size);
}
void *operator new[](size_t size)
{
return malloc(size);
}
void operator delete(void * ptr)
{
free(ptr);
}
void operator delete[](void * ptr)
{
free(ptr);
}

View file

@ -26,7 +26,6 @@
*
*/
#include "cpp_operators.hpp"
#include "task.hpp"
#include "queue.hpp"
@ -104,4 +103,4 @@ extern "C" void user_init(void)
task_1.task_create("tsk1");
task_2.task_create("tsk2");
}
}

View file

@ -0,0 +1,3 @@
# Component makefile for extras/cplusplus
INC_DIRS += $(ROOT)extras

View file

@ -1,75 +0,0 @@
/*
* The MIT License (MIT)
*
* ESP8266 FreeRTOS Firmware
* Copyright (c) 2015 Michael Jacobsen (github.com/mikejac)
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*
* https://github.com/SuperHouse/esp-open-rtos
*
*/
#ifndef ESP_OPEN_RTOS_CPLUSPLUS_HPP
#define ESP_OPEN_RTOS_CPLUSPLUS_HPP
#include <stdlib.h>
/******************************************************************************************************************
* C++ new and delete operators
*
*/
/**
*
* @param size
* @return
*/
inline void *operator new(size_t size)
{
return malloc(size);
}
/**
*
* @param size
* @return
*/
inline void *operator new[](size_t size)
{
return malloc(size);
}
/**
*
* @param ptr
*/
inline void operator delete(void * ptr)
{
free(ptr);
}
/**
*
* @param ptr
*/
inline void operator delete[](void * ptr)
{
free(ptr);
}
#endif /* ESP_OPEN_RTOS_CPLUSPLUS_HPP */