All tests passing, all VC++ projects consistent

This commit is contained in:
Beman
2013-05-10 11:26:17 -04:00
parent 6f496a40cd
commit fcb5386537
7 changed files with 56 additions and 25 deletions

View File

@@ -161,7 +161,6 @@ namespace endian
# endif # endif
} }
// runtime actual byte-order determination
inline BOOST_SCOPED_ENUM(order) actual_order(BOOST_SCOPED_ENUM(order) o) BOOST_NOEXCEPT inline BOOST_SCOPED_ENUM(order) actual_order(BOOST_SCOPED_ENUM(order) o) BOOST_NOEXCEPT
{ {
return o != order::native ? o : return o != order::native ? o :

View File

@@ -19,45 +19,45 @@ namespace be = boost::endian;
namespace namespace
{ {
void test_reorder() void test_reverse_bytes()
{ {
std::cout << "test_reorder...\n"; std::cout << "test_reorder...\n";
boost::int64_t i64 = 0x0102030405060708LL; boost::int64_t i64 = 0x0102030405060708LL;
BOOST_TEST_EQ(be::reorder(i64), 0x0807060504030201LL); BOOST_TEST_EQ(be::reverse_bytes(i64), 0x0807060504030201LL);
BOOST_TEST_EQ(be::reorder(be::reorder(i64)), i64); BOOST_TEST_EQ(be::reverse_bytes(be::reverse_bytes(i64)), i64);
i64 = 0xfefdfcfbfaf9f8f7LL; i64 = 0xfefdfcfbfaf9f8f7LL;
BOOST_TEST_EQ(be::reorder(i64), static_cast<boost::int64_t>(0xf7f8f9fafbfcfdfeULL)); BOOST_TEST_EQ(be::reverse_bytes(i64), static_cast<boost::int64_t>(0xf7f8f9fafbfcfdfeULL));
BOOST_TEST_EQ(be::reorder(be::reorder(i64)), i64); BOOST_TEST_EQ(be::reverse_bytes(be::reverse_bytes(i64)), i64);
boost::int32_t i32 = 0x01020304; boost::int32_t i32 = 0x01020304;
BOOST_TEST_EQ(be::reorder(i32), 0x04030201); BOOST_TEST_EQ(be::reverse_bytes(i32), 0x04030201);
BOOST_TEST_EQ(be::reorder(be::reorder(i32)), i32); BOOST_TEST_EQ(be::reverse_bytes(be::reverse_bytes(i32)), i32);
i32 = 0xfefdfcfb; i32 = 0xfefdfcfb;
BOOST_TEST_EQ(be::reorder(i32), static_cast<boost::int32_t>(0xfbfcfdfe)); BOOST_TEST_EQ(be::reverse_bytes(i32), static_cast<boost::int32_t>(0xfbfcfdfe));
BOOST_TEST_EQ(be::reorder(be::reorder(i32)), i32); BOOST_TEST_EQ(be::reverse_bytes(be::reverse_bytes(i32)), i32);
boost::int16_t i16 = 0x0102; boost::int16_t i16 = 0x0102;
BOOST_TEST_EQ(be::reorder(i16), 0x0201); BOOST_TEST_EQ(be::reverse_bytes(i16), 0x0201);
BOOST_TEST_EQ(be::reorder(be::reorder(i16)), i16); BOOST_TEST_EQ(be::reverse_bytes(be::reverse_bytes(i16)), i16);
i16 = static_cast<boost::int16_t>(static_cast<boost::uint16_t>(0xfefd)); i16 = static_cast<boost::int16_t>(static_cast<boost::uint16_t>(0xfefd));
BOOST_TEST_EQ(be::reorder(i16), static_cast<boost::int16_t>(static_cast<boost::uint16_t>(0xfdfe))); BOOST_TEST_EQ(be::reverse_bytes(i16), static_cast<boost::int16_t>(static_cast<boost::uint16_t>(0xfdfe)));
BOOST_TEST_EQ(be::reorder(be::reorder(i16)), i16); BOOST_TEST_EQ(be::reverse_bytes(be::reverse_bytes(i16)), i16);
boost::uint64_t ui64 = 0x0102030405060708ULL; boost::uint64_t ui64 = 0x0102030405060708ULL;
BOOST_TEST_EQ(be::reorder(ui64), 0x0807060504030201ULL); BOOST_TEST_EQ(be::reverse_bytes(ui64), 0x0807060504030201ULL);
BOOST_TEST_EQ(be::reorder(be::reorder(ui64)), ui64); BOOST_TEST_EQ(be::reverse_bytes(be::reverse_bytes(ui64)), ui64);
boost::uint32_t ui32 = 0x01020304; boost::uint32_t ui32 = 0x01020304;
BOOST_TEST_EQ(be::reorder(ui32), static_cast<boost::uint32_t>(0x04030201)); BOOST_TEST_EQ(be::reverse_bytes(ui32), static_cast<boost::uint32_t>(0x04030201));
BOOST_TEST_EQ(be::reorder(be::reorder(ui32)), ui32); BOOST_TEST_EQ(be::reverse_bytes(be::reverse_bytes(ui32)), ui32);
boost::uint16_t ui16 = 0x0102; boost::uint16_t ui16 = 0x0102;
BOOST_TEST_EQ(be::reorder(ui16), 0x0201); BOOST_TEST_EQ(be::reverse_bytes(ui16), 0x0201);
BOOST_TEST_EQ(be::reorder(be::reorder(ui16)), ui16); BOOST_TEST_EQ(be::reverse_bytes(be::reverse_bytes(ui16)), ui16);
std::cout << " test_reorder complete\n"; std::cout << " test_reorder complete\n";
} }
@@ -116,7 +116,7 @@ namespace
const boost::uint16_t lui16 = 0x0102; const boost::uint16_t lui16 = 0x0102;
# endif # endif
void test_conditional_reorder() void test_conditional_reverse_bytes()
{ {
std::cout << "test_conditional_reorder...\n"; std::cout << "test_conditional_reorder...\n";
@@ -156,8 +156,8 @@ namespace
int cpp_main(int, char * []) int cpp_main(int, char * [])
{ {
std::cerr << std::hex; std::cerr << std::hex;
test_reorder(); test_reverse_bytes();
test_conditional_reorder(); test_conditional_reverse_bytes();
return ::boost::report_errors(); return ::boost::report_errors();
} }

View File

@@ -43,9 +43,13 @@
<PropertyGroup Label="UserMacros" /> <PropertyGroup Label="UserMacros" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<LinkIncremental>true</LinkIncremental> <LinkIncremental>true</LinkIncremental>
<OutDir>$(SolutionDir)$(Configuration)\</OutDir>
<IntDir>$(Configuration)\</IntDir>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<LinkIncremental>false</LinkIncremental> <LinkIncremental>false</LinkIncremental>
<OutDir>$(SolutionDir)$(Configuration)\</OutDir>
<IntDir>$(Configuration)\</IntDir>
</PropertyGroup> </PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile> <ClCompile>
@@ -60,7 +64,8 @@
<GenerateDebugInformation>true</GenerateDebugInformation> <GenerateDebugInformation>true</GenerateDebugInformation>
</Link> </Link>
<PostBuildEvent> <PostBuildEvent>
<Command>"$(TargetDir)\$(TargetName).exe" 100</Command> <Command>"$(TargetDir)\$(TargetName).exe" 10</Command>
<Message>Executing test...</Message>
</PostBuildEvent> </PostBuildEvent>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -82,7 +87,8 @@
<OptimizeReferences>true</OptimizeReferences> <OptimizeReferences>true</OptimizeReferences>
</Link> </Link>
<PostBuildEvent> <PostBuildEvent>
<Command>"$(TargetDir)\$(TargetName).exe" 100000</Command> <Command>"$(TargetDir)\$(TargetName).exe"</Command>
<Message>Executing test...</Message>
</PostBuildEvent> </PostBuildEvent>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemGroup> <ItemGroup>

View File

@@ -43,9 +43,13 @@
<PropertyGroup Label="UserMacros" /> <PropertyGroup Label="UserMacros" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<LinkIncremental>true</LinkIncremental> <LinkIncremental>true</LinkIncremental>
<OutDir>$(SolutionDir)$(Configuration)\</OutDir>
<IntDir>$(Configuration)\</IntDir>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<LinkIncremental>false</LinkIncremental> <LinkIncremental>false</LinkIncremental>
<OutDir>$(SolutionDir)$(Configuration)\</OutDir>
<IntDir>$(Configuration)\</IntDir>
</PropertyGroup> </PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile> <ClCompile>
@@ -59,6 +63,9 @@
<SubSystem>Console</SubSystem> <SubSystem>Console</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation> <GenerateDebugInformation>true</GenerateDebugInformation>
</Link> </Link>
<PostBuildEvent>
<Message>Executing test...</Message>
</PostBuildEvent>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile> <ClCompile>
@@ -76,6 +83,9 @@
<EnableCOMDATFolding>true</EnableCOMDATFolding> <EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences> <OptimizeReferences>true</OptimizeReferences>
</Link> </Link>
<PostBuildEvent>
<Message>Executing test...</Message>
</PostBuildEvent>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemGroup> <ItemGroup>
<ClCompile Include="..\..\converter_test.cpp" /> <ClCompile Include="..\..\converter_test.cpp" />

View File

@@ -46,6 +46,10 @@
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Configuration)\</IntDir> <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Configuration)\</IntDir>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental> <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<OutDir>$(SolutionDir)$(Configuration)\</OutDir>
<IntDir>$(Configuration)\</IntDir>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile> <ClCompile>
<Optimization>Disabled</Optimization> <Optimization>Disabled</Optimization>

View File

@@ -44,6 +44,14 @@
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental> <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental> <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<OutDir>$(SolutionDir)$(Configuration)\</OutDir>
<IntDir>$(Configuration)\</IntDir>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<OutDir>$(SolutionDir)$(Configuration)\</OutDir>
<IntDir>$(Configuration)\</IntDir>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile> <ClCompile>
<Optimization>Disabled</Optimization> <Optimization>Disabled</Optimization>

View File

@@ -46,6 +46,10 @@
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Configuration)\</IntDir> <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Configuration)\</IntDir>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental> <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<OutDir>$(SolutionDir)$(Configuration)\</OutDir>
<IntDir>$(Configuration)\</IntDir>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile> <ClCompile>
<Optimization>Disabled</Optimization> <Optimization>Disabled</Optimization>