coffee/etl
1
0
Fork 0
mirror of https://github.com/ETLCPP/etl.git synced 2026-11-09 14:49:53 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/hotfix/move_cpp03_force_macros_to_profile' into development

Browse Source
This commit is contained in:
John Wellbelove 2019-02-23 08:37:04 +01:00
commit a9e5587f37
8 changed files with 32 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/etl/priority_queue.h
View File

@ -48,8 +48,6 @@ SOFTWARE.
#undef ETL_FILE
#define ETL_FILE "12"
#define ETL_PRIORITY_QUEUE_FORCE_CPP03 0
//*****************************************************************************
///\defgroup queue queue
/// A priority queue with the capacity defined at compile time,

2
include/etl/queue_mpmc_mutex.h
View File

@ -44,8 +44,6 @@ SOFTWARE.
#undef ETL_FILE
#define ETL_FILE "48"
#define ETL_QUEUE_MPMC_MUTEX_FORCE_CPP03 0
namespace etl
{
template <const size_t MEMORY_MODEL = etl::memory_model::MEMORY_MODEL_LARGE>

2
include/etl/queue_spsc_atomic.h
View File

@ -44,8 +44,6 @@ SOFTWARE.
#undef ETL_FILE
#define ETL_FILE "47"
#define ETL_QUEUE_ATOMIC_FORCE_CPP03 0
namespace etl
{
template <const size_t MEMORY_MODEL = etl::memory_model::MEMORY_MODEL_LARGE>

2
include/etl/variant.h
View File

@ -51,8 +51,6 @@ SOFTWARE.
#undef ETL_FILE
#define ETL_FILE "24"
#define ETL_VARIANT_FORCE_CPP03 0
//*****************************************************************************
///\defgroup variant variant
/// A class that can contain one a several specified types in a type safe manner.

2
include/etl/version.h
View File

@ -39,7 +39,7 @@ SOFTWARE.
#define ETL_VERSION_MAJOR 14
#define ETL_VERSION_MINOR 11
#define ETL_VERSION_PATCH 2
#define ETL_VERSION_PATCH 3
#define ETL_VERSION ETL_STRINGIFY(ETL_VERSION_MAJOR) ETL_STRINGIFY(ETL_VERSION_MINOR) ETL_STRINGIFY(ETL_VERSION_PATCH)
#define ETL_VERSION_W ETL_WIDE_STRING(ETL_CONCAT(ETL_CONCAT(ETL_VERSION_MAJOR, ETL_VERSION_MINOR), ETL_VERSION_PATCH))

4
support/Release notes.txt
View File

@ -1,3 +1,7 @@
===============================================================================
14.11.3
Moved C++03 force macros to test profile.
===============================================================================
14.11.2
Fix inconsistent ETL_FILE definitions.

6
test/etl_profile.h
View File

@ -76,6 +76,12 @@ SOFTWARE.
//#define ETL_NO_STL
#define ETL_FUNCTION_FORCE_CPP03 0
#define ETL_QUEUE_MPMC_MUTEX_FORCE_CPP03 0
#define ETL_PRIORITY_QUEUE_FORCE_CPP03 0
#define ETL_QUEUE_ATOMIC_FORCE_CPP03 0
#define ETL_VARIANT_FORCE_CPP03 0
#ifdef _MSC_VER
#include "etl/profiles/msvc_x86.h"
#else

42
test/test_function.cpp
View File

@ -32,7 +32,7 @@ SOFTWARE.
//*****************************************************************************
const int VALUE = 1;
bool function_called = false;
bool function_called = false;
bool parameter_correct = false;
//*****************************************************************************
@ -108,7 +108,7 @@ void free_void()
//*****************************************************************************
void free_int(int i)
{
function_called = true;
function_called = true;
parameter_correct = (i == VALUE);
}
@ -117,7 +117,7 @@ void free_int(int i)
//*****************************************************************************
void free_reference(const Data& data)
{
function_called = true;
function_called = true;
parameter_correct = (data.d == VALUE);
}
@ -155,13 +155,13 @@ struct SetupFixture
{
SetupFixture()
{
function_called = false;
function_called = false;
parameter_correct = false;
}
};
namespace
{
{
SUITE(test_function)
{
//*************************************************************************
@ -173,8 +173,8 @@ namespace
CHECK(function_called);
}
//*************************************************************************
//*************************************************************************
TEST_FIXTURE(SetupFixture, test_const_free_void)
{
const etl::function<void, void> function(free_void);
@ -194,7 +194,7 @@ namespace
CHECK(function_called);
CHECK(parameter_correct);
}
//*************************************************************************
TEST_FIXTURE(SetupFixture, test_const_free_int)
{
@ -216,7 +216,7 @@ namespace
CHECK(function_called);
CHECK(parameter_correct);
}
//*************************************************************************
TEST_FIXTURE(SetupFixture, test_const_free_reference)
{
@ -237,7 +237,7 @@ namespace
CHECK(function_called);
}
//*************************************************************************
TEST_FIXTURE(SetupFixture, test_const_free_void_compile_time)
{
@ -258,7 +258,7 @@ namespace
CHECK(function_called);
CHECK(parameter_correct);
}
//*************************************************************************
TEST_FIXTURE(SetupFixture, test_const_free_int_compile_time)
{
@ -280,7 +280,7 @@ namespace
CHECK(function_called);
CHECK(parameter_correct);
}
//*************************************************************************
TEST_FIXTURE(SetupFixture, test_const_free_reference_compile_time)
{
@ -302,7 +302,7 @@ namespace
CHECK(function_called);
}
//*************************************************************************
TEST_FIXTURE(SetupFixture, test_const_member_void)
{
@ -325,7 +325,7 @@ namespace
CHECK(function_called);
CHECK(parameter_correct);
}
//*************************************************************************
TEST_FIXTURE(SetupFixture, test_const_member_int)
{
@ -349,7 +349,7 @@ namespace
CHECK(function_called);
CHECK(parameter_correct);
}
//*************************************************************************
TEST_FIXTURE(SetupFixture, test_const_member_reference)
{
@ -372,7 +372,7 @@ namespace
CHECK(function_called);
}
//*************************************************************************
TEST_FIXTURE(SetupFixture, test_const_member_void_compile_time)
{
@ -395,7 +395,7 @@ namespace
CHECK(function_called);
CHECK(parameter_correct);
}
//*************************************************************************
TEST_FIXTURE(SetupFixture, test_const_member_int_compile_time)
{
@ -419,7 +419,7 @@ namespace
CHECK(function_called);
CHECK(parameter_correct);
}
//*************************************************************************
TEST_FIXTURE(SetupFixture, test_const_member_reference_compile_time)
{
@ -443,7 +443,7 @@ namespace
CHECK(function_called);
}
//*************************************************************************
TEST_FIXTURE(SetupFixture, test_const_instance_member_void_compile_time)
{
@ -467,7 +467,7 @@ namespace
CHECK(function_called);
}
//*************************************************************************
TEST_FIXTURE(SetupFixture, test_const_instance_member_parameter_compile_time)
{
@ -491,7 +491,7 @@ namespace
CHECK(function_called);
}
//*************************************************************************
TEST_FIXTURE(SetupFixture, test_const_instance_member_reference_compile_time)
{