Commit d189835e authored by Jan Möbius's avatar Jan Möbius

More compiler errors fixes for VS2015

parent 28b165d0
Pipeline #2033 passed with stage
in 81 minutes and 59 seconds
......@@ -395,7 +395,8 @@ TEST_F(BSP_CUBE_BASE, RayIntersectionAboveSurface_NonDirectionalFunction_Negativ
Mesh::Point nyDirection(0.0,-1.0,0.0);
Mesh::Point p1(-0.5,-2.0,0.0);
BSP::RayCollision rc = bsp_->raycollision(p1,nyDirection);
BSP::RayCollision rc;
rc = bsp_->raycollision(p1,nyDirection);
EXPECT_EQ(2u, rc.size() ) << "Wrong number of hit faces in ray collision test 1";
if ( rc.size() == 2u ) { // Don't crash on wrong size
......@@ -423,7 +424,8 @@ TEST_F(BSP_CUBE_BASE, RayIntersectionAboveSurface_NonDirectionalFunction_2 ) {
Mesh::Point yDirection(0.0,1.0,0.0);
Mesh::Point p1(0.5,-2.0,0.0);
BSP::RayCollision rc = bsp_->raycollision(p1,yDirection);
BSP::RayCollision rc;
rc = bsp_->raycollision(p1,yDirection);
EXPECT_EQ(2u, rc.size() ) << "Wrong number of hit faces in ray collision test 2";
if ( rc.size() == 2u ) { // Don't crash on wrong size
......@@ -453,7 +455,8 @@ TEST_F(BSP_CUBE_BASE, RayIntersectionAboveSurface_NonDirectionalFunction_Negativ
Mesh::Point nyDirection(0.0,-1.0,0.0);
Mesh::Point p1(0.5,-2.0,0.0);
BSP::RayCollision rc = bsp_->raycollision(p1,nyDirection);
BSP::RayCollision rc;
rc = bsp_->raycollision(p1,nyDirection);
EXPECT_EQ(2u, rc.size() ) << "Wrong number of hit faces in ray collision test 2";
if ( rc.size() == 2u ) { // Don't crash on wrong size
......@@ -490,7 +493,8 @@ TEST_F(BSP_CUBE_BASE, RayIntersectionAboveSurface_DirectionalFunction_1 ) {
Mesh::Point yDirection(0.0,1.0,0.0);
Mesh::Point origin(-0.5,-2.0,0.0);
BSP::RayCollision rc = bsp_->directionalRaycollision(origin,yDirection);
BSP::RayCollision rc;
rc = bsp_->directionalRaycollision(origin,yDirection);
EXPECT_EQ(2u, rc.size() ) << "Wrong number of hit faces in ray collision test 1";
if ( rc.size() == 2u ) { // Don't crash on wrong size
......@@ -546,7 +550,8 @@ TEST_F(BSP_CUBE_BASE, RayIntersectionAboveSurface_DirectionalFunction_NegativeDi
Mesh::Point nyDirection(0.0,-1.0,0.0);
Mesh::Point p1(-0.5,-2.0,0.0);
BSP::RayCollision rc = bsp_->directionalRaycollision(p1,nyDirection);
BSP::RayCollision rc;
rc = bsp_->directionalRaycollision(p1,nyDirection);
EXPECT_EQ(0u, rc.size() ) << "Wrong number of hit faces in ray collision test 1";
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment