All tests passing, all VC++ projects consistent

2025-08-01 05:24:39 +02:00 · 2013-05-10 11:26:17 -04:00
parent 6f496a40cd
commit fcb5386537
7 changed files with 56 additions and 25 deletions
--- a/include/boost/endian/converters.hpp
+++ b/include/boost/endian/converters.hpp
@@ -161,7 +161,6 @@ namespace endian
 #   endif
  }

-  //  runtime actual byte-order determination
  inline BOOST_SCOPED_ENUM(order) actual_order(BOOST_SCOPED_ENUM(order) o) BOOST_NOEXCEPT
  {
    return o != order::native ? o :
--- a/test/converter_test.cpp
+++ b/test/converter_test.cpp
@@ -19,45 +19,45 @@ namespace be = boost::endian;
 namespace
 {

-  void test_reorder()
+  void test_reverse_bytes()
  {
    std::cout << "test_reorder...\n";

    boost::int64_t i64 = 0x0102030405060708LL;
-    BOOST_TEST_EQ(be::reorder(i64), 0x0807060504030201LL);
-    BOOST_TEST_EQ(be::reorder(be::reorder(i64)), i64);
+    BOOST_TEST_EQ(be::reverse_bytes(i64), 0x0807060504030201LL);
+    BOOST_TEST_EQ(be::reverse_bytes(be::reverse_bytes(i64)), i64);

    i64 = 0xfefdfcfbfaf9f8f7LL;
-    BOOST_TEST_EQ(be::reorder(i64), static_cast<boost::int64_t>(0xf7f8f9fafbfcfdfeULL));
-    BOOST_TEST_EQ(be::reorder(be::reorder(i64)), i64);
+    BOOST_TEST_EQ(be::reverse_bytes(i64), static_cast<boost::int64_t>(0xf7f8f9fafbfcfdfeULL));
+    BOOST_TEST_EQ(be::reverse_bytes(be::reverse_bytes(i64)), i64);

    boost::int32_t i32 = 0x01020304;
-    BOOST_TEST_EQ(be::reorder(i32), 0x04030201);
-    BOOST_TEST_EQ(be::reorder(be::reorder(i32)), i32);
+    BOOST_TEST_EQ(be::reverse_bytes(i32), 0x04030201);
+    BOOST_TEST_EQ(be::reverse_bytes(be::reverse_bytes(i32)), i32);

    i32 = 0xfefdfcfb;
-    BOOST_TEST_EQ(be::reorder(i32), static_cast<boost::int32_t>(0xfbfcfdfe));
-    BOOST_TEST_EQ(be::reorder(be::reorder(i32)), i32);
+    BOOST_TEST_EQ(be::reverse_bytes(i32), static_cast<boost::int32_t>(0xfbfcfdfe));
+    BOOST_TEST_EQ(be::reverse_bytes(be::reverse_bytes(i32)), i32);

    boost::int16_t i16 = 0x0102;
-    BOOST_TEST_EQ(be::reorder(i16), 0x0201);
-    BOOST_TEST_EQ(be::reorder(be::reorder(i16)), i16);
+    BOOST_TEST_EQ(be::reverse_bytes(i16), 0x0201);
+    BOOST_TEST_EQ(be::reverse_bytes(be::reverse_bytes(i16)), i16);

    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::reorder(be::reorder(i16)), i16);
+    BOOST_TEST_EQ(be::reverse_bytes(i16), static_cast<boost::int16_t>(static_cast<boost::uint16_t>(0xfdfe)));
+    BOOST_TEST_EQ(be::reverse_bytes(be::reverse_bytes(i16)), i16);

    boost::uint64_t ui64 = 0x0102030405060708ULL;
-    BOOST_TEST_EQ(be::reorder(ui64), 0x0807060504030201ULL);
-    BOOST_TEST_EQ(be::reorder(be::reorder(ui64)), ui64);
+    BOOST_TEST_EQ(be::reverse_bytes(ui64), 0x0807060504030201ULL);
+    BOOST_TEST_EQ(be::reverse_bytes(be::reverse_bytes(ui64)), ui64);

    boost::uint32_t ui32 = 0x01020304;
-    BOOST_TEST_EQ(be::reorder(ui32), static_cast<boost::uint32_t>(0x04030201));
-    BOOST_TEST_EQ(be::reorder(be::reorder(ui32)), ui32);
+    BOOST_TEST_EQ(be::reverse_bytes(ui32), static_cast<boost::uint32_t>(0x04030201));
+    BOOST_TEST_EQ(be::reverse_bytes(be::reverse_bytes(ui32)), ui32);

    boost::uint16_t ui16 = 0x0102;
-    BOOST_TEST_EQ(be::reorder(ui16), 0x0201);
-    BOOST_TEST_EQ(be::reorder(be::reorder(ui16)), ui16);
+    BOOST_TEST_EQ(be::reverse_bytes(ui16), 0x0201);
+    BOOST_TEST_EQ(be::reverse_bytes(be::reverse_bytes(ui16)), ui16);
    
    std::cout << "  test_reorder complete\n";
  }
@@ -116,7 +116,7 @@ namespace
  const boost::uint16_t lui16 = 0x0102;
 # endif

-  void test_conditional_reorder()
+  void test_conditional_reverse_bytes()
  {
    std::cout << "test_conditional_reorder...\n";

@@ -156,8 +156,8 @@ namespace
 int cpp_main(int, char * [])
 {
  std::cerr << std::hex;
-  test_reorder();
-  test_conditional_reorder();
+  test_reverse_bytes();
+  test_conditional_reverse_bytes();

  return ::boost::report_errors();
 }
--- a/test/msvc2012/benchmark/benchmark.vcxproj
+++ b/test/msvc2012/benchmark/benchmark.vcxproj
@@ -43,9 +43,13 @@
  <PropertyGroup Label="UserMacros" />
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
    <LinkIncremental>true</LinkIncremental>
+    <OutDir>$(SolutionDir)$(Configuration)\</OutDir>
+    <IntDir>$(Configuration)\</IntDir>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
    <LinkIncremental>false</LinkIncremental>
+    <OutDir>$(SolutionDir)$(Configuration)\</OutDir>
+    <IntDir>$(Configuration)\</IntDir>
  </PropertyGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
    <ClCompile>
@@ -60,7 +64,8 @@
      <GenerateDebugInformation>true</GenerateDebugInformation>
    </Link>
    <PostBuildEvent>
-      <Command>"$(TargetDir)\$(TargetName).exe" 100</Command>
+      <Command>"$(TargetDir)\$(TargetName).exe" 10</Command>
+      <Message>Executing test...</Message>
    </PostBuildEvent>
  </ItemDefinitionGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -82,7 +87,8 @@
      <OptimizeReferences>true</OptimizeReferences>
    </Link>
    <PostBuildEvent>
-      <Command>"$(TargetDir)\$(TargetName).exe" 100000</Command>
+      <Command>"$(TargetDir)\$(TargetName).exe"</Command>
+      <Message>Executing test...</Message>
    </PostBuildEvent>
  </ItemDefinitionGroup>
  <ItemGroup>
--- a/test/msvc2012/converter_test/converter_test.vcxproj
+++ b/test/msvc2012/converter_test/converter_test.vcxproj
@@ -43,9 +43,13 @@
  <PropertyGroup Label="UserMacros" />
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
    <LinkIncremental>true</LinkIncremental>
+    <OutDir>$(SolutionDir)$(Configuration)\</OutDir>
+    <IntDir>$(Configuration)\</IntDir>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
    <LinkIncremental>false</LinkIncremental>
+    <OutDir>$(SolutionDir)$(Configuration)\</OutDir>
+    <IntDir>$(Configuration)\</IntDir>
  </PropertyGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
    <ClCompile>
@@ -59,6 +63,9 @@
      <SubSystem>Console</SubSystem>
      <GenerateDebugInformation>true</GenerateDebugInformation>
    </Link>
+    <PostBuildEvent>
+      <Message>Executing test...</Message>
+    </PostBuildEvent>
  </ItemDefinitionGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
    <ClCompile>
@@ -76,6 +83,9 @@
      <EnableCOMDATFolding>true</EnableCOMDATFolding>
      <OptimizeReferences>true</OptimizeReferences>
    </Link>
+    <PostBuildEvent>
+      <Message>Executing test...</Message>
+    </PostBuildEvent>
  </ItemDefinitionGroup>
  <ItemGroup>
    <ClCompile Include="..\..\converter_test.cpp" />
--- a/test/msvc2012/endian_in_union_test/endian_in_union_test.vcxproj
+++ b/test/msvc2012/endian_in_union_test/endian_in_union_test.vcxproj
@@ -46,6 +46,10 @@
    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Configuration)\</IntDir>
    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <OutDir>$(SolutionDir)$(Configuration)\</OutDir>
+    <IntDir>$(Configuration)\</IntDir>
+  </PropertyGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
    <ClCompile>
      <Optimization>Disabled</Optimization>
--- a/test/msvc2012/endian_operations_test/endian_operations_test.vcxproj
+++ b/test/msvc2012/endian_operations_test/endian_operations_test.vcxproj
@@ -44,6 +44,14 @@
    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
  </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'">
    <ClCompile>
      <Optimization>Disabled</Optimization>
--- a/test/msvc2012/endian_test/endian_test.vcxproj
+++ b/test/msvc2012/endian_test/endian_test.vcxproj
@@ -46,6 +46,10 @@
    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Configuration)\</IntDir>
    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <OutDir>$(SolutionDir)$(Configuration)\</OutDir>
+    <IntDir>$(Configuration)\</IntDir>
+  </PropertyGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
    <ClCompile>
      <Optimization>Disabled</Optimization>