Add support for deprecated names from pre-review releases.

This commit is contained in:
Beman committed 2015-01-18 19:48:27 -05:00
1 parent e9ae69f3d0
commit adee2fe513
9 files changed
+412 -44

No files matched your search

+183
View File
@@ -0,0 +1,183 @@
// deprecated_test.cpp ---------------------------------------------------------------//
// Copyright Beman Dawes 2014, 2015
// Distributed under the Boost Software License, Version 1.0.
// See http://www.boost.org/LICENSE_1_0.txt
// See library home page at http://www.boost.org/libs/endian
//--------------------------------------------------------------------------------------//
#include <boost/endian/detail/disable_warnings.hpp>
#define BOOST_ENDIAN_DEPRECATED_NAMES
#include <boost/endian/endian.hpp>
#include <boost/detail/lightweight_main.hpp>
#include <boost/detail/lightweight_test.hpp>
#include <iostream>
#include <sstream>
using namespace boost::endian;
using std::cout;
using std::endl;
namespace
{
// check_size ----------------------------------------------------------------------//
void check_size()
{
BOOST_TEST_EQ(sizeof(big8_t), 1);
BOOST_TEST_EQ(sizeof(big16_t), 2);
BOOST_TEST_EQ(sizeof(big24_t), 3);
BOOST_TEST_EQ(sizeof(big32_t), 4);
BOOST_TEST_EQ(sizeof(big40_t), 5);
BOOST_TEST_EQ(sizeof(big48_t), 6);
BOOST_TEST_EQ(sizeof(big56_t), 7);
BOOST_TEST_EQ(sizeof(big64_t), 8);
BOOST_TEST_EQ(sizeof(ubig8_t), 1);
BOOST_TEST_EQ(sizeof(ubig16_t), 2);
BOOST_TEST_EQ(sizeof(ubig24_t), 3);
BOOST_TEST_EQ(sizeof(ubig32_t), 4);
BOOST_TEST_EQ(sizeof(ubig40_t), 5);
BOOST_TEST_EQ(sizeof(ubig48_t), 6);
BOOST_TEST_EQ(sizeof(ubig56_t), 7);
BOOST_TEST_EQ(sizeof(ubig64_t), 8);
BOOST_TEST_EQ(sizeof(little8_t), 1);
BOOST_TEST_EQ(sizeof(little16_t), 2);
BOOST_TEST_EQ(sizeof(little24_t), 3);
BOOST_TEST_EQ(sizeof(little32_t), 4);
BOOST_TEST_EQ(sizeof(little40_t), 5);
BOOST_TEST_EQ(sizeof(little48_t), 6);
BOOST_TEST_EQ(sizeof(little56_t), 7);
BOOST_TEST_EQ(sizeof(little64_t), 8);
BOOST_TEST_EQ(sizeof(ulittle8_t), 1);
BOOST_TEST_EQ(sizeof(ulittle16_t), 2);
BOOST_TEST_EQ(sizeof(ulittle24_t), 3);
BOOST_TEST_EQ(sizeof(ulittle32_t), 4);
BOOST_TEST_EQ(sizeof(ulittle40_t), 5);
BOOST_TEST_EQ(sizeof(ulittle48_t), 6);
BOOST_TEST_EQ(sizeof(ulittle56_t), 7);
BOOST_TEST_EQ(sizeof(ulittle64_t), 8);
BOOST_TEST_EQ(sizeof(native8_t), 1);
BOOST_TEST_EQ(sizeof(native16_t), 2);
BOOST_TEST_EQ(sizeof(native24_t), 3);
BOOST_TEST_EQ(sizeof(native32_t), 4);
BOOST_TEST_EQ(sizeof(native40_t), 5);
BOOST_TEST_EQ(sizeof(native48_t), 6);
BOOST_TEST_EQ(sizeof(native56_t), 7);
BOOST_TEST_EQ(sizeof(native64_t), 8);
BOOST_TEST_EQ(sizeof(unative8_t), 1);
BOOST_TEST_EQ(sizeof(unative16_t), 2);
BOOST_TEST_EQ(sizeof(unative24_t), 3);
BOOST_TEST_EQ(sizeof(unative32_t), 4);
BOOST_TEST_EQ(sizeof(unative40_t), 5);
BOOST_TEST_EQ(sizeof(unative48_t), 6);
BOOST_TEST_EQ(sizeof(unative56_t), 7);
BOOST_TEST_EQ(sizeof(unative64_t), 8);
BOOST_TEST_EQ(sizeof(aligned_big16_t), 2);
BOOST_TEST_EQ(sizeof(aligned_big32_t), 4);
BOOST_TEST_EQ(sizeof(aligned_big64_t), 8);
BOOST_TEST_EQ(sizeof(aligned_ubig16_t), 2);
BOOST_TEST_EQ(sizeof(aligned_ubig32_t), 4);
BOOST_TEST_EQ(sizeof(aligned_ubig64_t), 8);
BOOST_TEST_EQ(sizeof(aligned_little16_t), 2);
BOOST_TEST_EQ(sizeof(aligned_little32_t), 4);
BOOST_TEST_EQ(sizeof(aligned_little64_t), 8);
BOOST_TEST_EQ(sizeof(aligned_ulittle16_t), 2);
BOOST_TEST_EQ(sizeof(aligned_ulittle32_t), 4);
BOOST_TEST_EQ(sizeof(aligned_ulittle64_t), 8);
# ifndef BOOST_NO_CXX11_TEMPLATE_ALIASES
BOOST_TEST_EQ(sizeof(endian<endianness::big, int_least16_t, 16>), 2);
BOOST_TEST_EQ(sizeof(endian<endianness::big,
int_least16_t, 16, alignment::unaligned>), 2);
# endif
} // check_size
// test_inserter_and_extractor -----------------------------------------------------//
void test_inserter_and_extractor()
{
std::cout << "test inserter and extractor..." << std::endl;
ubig64_t bu64(0x010203040506070ULL);
ulittle64_t lu64(0x010203040506070ULL);
uint64_t x;
std::stringstream ss;
ss << bu64;
ss >> x;
BOOST_TEST_EQ(x, 0x010203040506070ULL);
ss.clear();
ss << lu64;
ss >> x;
BOOST_TEST_EQ(x, 0x010203040506070ULL);
ss.clear();
ss << 0x010203040506070ULL;
ubig64_t bu64z(0);
ss >> bu64z;
BOOST_TEST_EQ(bu64z, bu64);
ss.clear();
ss << 0x010203040506070ULL;
ulittle64_t lu64z(0);
ss >> lu64z;
BOOST_TEST_EQ(lu64z, lu64);
std::cout << "test inserter and extractor complete" << std::endl;
}
} // unnamed namespace
//--------------------------------------------------------------------------------------//
int cpp_main(int, char *[])
{
cout << "byte swap intrinsics: " BOOST_ENDIAN_INTRINSIC_MSG << endl;
cout << " construct big endian aligned" << endl;
big32_t x(1122334455);
cout << " assign to buffer from built-in integer" << endl;
x = 1234567890;
cout << " operator==(buffer.value(), built-in)" << endl;
bool b1(x == 1234567890);
BOOST_TEST(b1);
cout << " construct little endian unaligned" << endl;
little32_t x2(1122334455);
cout << " assign to buffer from built-in integer" << endl;
x2 = 1234567890;
cout << " operator==(buffer.value(), built-in)" << endl;
bool b2(x2 == 1234567890);
BOOST_TEST(b2);
check_size();
test_inserter_and_extractor();
cout << " done" << endl;
return ::boost::report_errors();
}
#include <boost/endian/detail/disable_warnings_pop.hpp>
+10 -1
View File
@@ -16,12 +16,20 @@
#include <boost/endian/arithmetic.hpp>
#include <boost/cstdint.hpp>
#include <boost/timer/timer.hpp>
#include <boost/lexical_cast.hpp>
#include <iostream>
#include <cstdlib>
#include <string>
#include <boost/detail/lightweight_main.hpp>
#ifdef _MSC_VER
# pragma warning (push)
# pragma warning (disable : 4459)
#endif
#include <boost/lexical_cast.hpp>
#ifdef _MSC_VER
# pragma warning (pop)
#endif
using namespace boost;
using namespace boost::endian;
@@ -245,6 +253,7 @@ int cpp_main(int argc, char* argv[])
cout
<< "<html>\n<head>\n<title>Endian Loop Time Test</title>\n</head>\n<body>\n"
<< "<!-- boost-no-inspect -->\n"
<< "<div align=\"center\"> <center>\n"
<< "<table border=\"1\" cellpadding=\"5\" cellspacing=\"0\""
<< "style=\"border-collapse: collapse\" bordercolor=\"#111111\">\n"
@@ -0,0 +1,88 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|Win32">
<Configuration>Release</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
</ItemGroup>
<PropertyGroup Label="Globals">
<ProjectGuid>{DA4BC67F-9284-4D2C-81D5-407312C31BD7}</ProjectGuid>
<Keyword>Win32Proj</Keyword>
<RootNamespace>deprecated_test</RootNamespace>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<PlatformToolset>v140</PlatformToolset>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<PlatformToolset>v140</PlatformToolset>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
</ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="..\common.props" />
</ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="..\common.props" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<LinkIncremental>true</LinkIncremental>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<LinkIncremental>false</LinkIncremental>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<PrecompiledHeader>
</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization>
<PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<SDLCheck>true</SDLCheck>
</ClCompile>
<Link>
<SubSystem>Console</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
<WarningLevel>Level3</WarningLevel>
<PrecompiledHeader>
</PrecompiledHeader>
<Optimization>MaxSpeed</Optimization>
<FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
<PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<SDLCheck>true</SDLCheck>
</ClCompile>
<Link>
<SubSystem>Console</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
</Link>
</ItemDefinitionGroup>
<ItemGroup>
<ClCompile Include="..\..\deprecated_test.cpp" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
</Project>
+8
View File
@@ -31,6 +31,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "associated-files", "associa
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "experiment", "experiment\experiment.vcxproj", "{CE9D8719-6E86-41D0-97CA-5BE5272594E9}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "deprecated_test", "deprecated_test\deprecated_test.vcxproj", "{DA4BC67F-9284-4D2C-81D5-407312C31BD7}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
@@ -145,6 +147,12 @@ Global
{CE9D8719-6E86-41D0-97CA-5BE5272594E9}.Release|Win32.ActiveCfg = Release|Win32
{CE9D8719-6E86-41D0-97CA-5BE5272594E9}.Release|Win32.Build.0 = Release|Win32
{CE9D8719-6E86-41D0-97CA-5BE5272594E9}.Release|x64.ActiveCfg = Release|Win32
{DA4BC67F-9284-4D2C-81D5-407312C31BD7}.Debug|Win32.ActiveCfg = Debug|Win32
{DA4BC67F-9284-4D2C-81D5-407312C31BD7}.Debug|Win32.Build.0 = Debug|Win32
{DA4BC67F-9284-4D2C-81D5-407312C31BD7}.Debug|x64.ActiveCfg = Debug|Win32
{DA4BC67F-9284-4D2C-81D5-407312C31BD7}.Release|Win32.ActiveCfg = Release|Win32
{DA4BC67F-9284-4D2C-81D5-407312C31BD7}.Release|Win32.Build.0 = Release|Win32
{DA4BC67F-9284-4D2C-81D5-407312C31BD7}.Release|x64.ActiveCfg = Release|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE