merge todd's change

Author: RichardWarburton

CMakeLists.txt

@@ -33,8 +33,10 @@ set(GTEST_SOURCE_DIR ${source_dir})
 ExternalProject_Get_Property(gtest binary_dir)
 set(GTEST_BINARY_DIR ${binary_dir})
 
+find_package(Threads)
+
 if(UNIX)
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++98 -Wall -DNDEBUG")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++98 -fexceptions -g -Wall -Ofast -DNDEBUG")
 endif()
 
 if(APPLE)

test/cpp/OtfArrayTest.cpp

@@ -103,7 +103,9 @@ class OtfUInt32ArrayTest : public OtfMessageTest, public OtfMessageTestCBs
  uint32_t *array = (uint32_t *)dst;
  for (int i = 0; i < length; i++)
  {
- array[i] = seed ^ i;
+ uint32_t value = seed ^ i;
+ ::memcpy(array, &value, sizeof(uint32_t));
+ array++;
  }
  }
 

test/cpp/OtfFullIrTest.cpp

@@ -330,7 +330,7 @@ class OtfFullIrTest : public testing::Test, public IrCollection, public Ir::Call
  EXPECT_EQ(f.primitiveType(3), Ir::CHAR);
  EXPECT_EQ(f.length(3), MANUFACTURER_CODE_LENGTH);
  f.getArray(3, tmp, 0, f.length(3));
- EXPECT_EQ(std::string(tmp, MANUFACTURER_CODE_LENGTH), MANUFACTURER_CODE);
+ EXPECT_EQ(std::string(tmp, MANUFACTURER_CODE_LENGTH), std::string(MANUFACTURER_CODE, MANUFACTURER_CODE_LENGTH));
  EXPECT_EQ(f.primitiveType(4), Ir::CHAR);
  EXPECT_EQ(f.length(4), 6);
  f.getArray(4, tmp, 0, f.length(4));