From 9883df973564b102b5366d23397e7ec9d33e235a Mon Sep 17 00:00:00 2001 From: tatsy Date: Tue, 15 Mar 2016 14:17:43 +0900 Subject: [PATCH] Revise build error on LLVM Clang. --- sources/bxdf/bssrdf.h | 2 +- test/test_scene.cc | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/sources/bxdf/bssrdf.h b/sources/bxdf/bssrdf.h index a1cdf11..0341e86 100644 --- a/sources/bxdf/bssrdf.h +++ b/sources/bxdf/bssrdf.h @@ -44,7 +44,7 @@ class SPICA_EXPORTS SeparableBSSRDF : public BSSRDF { // Public methods SeparableBSSRDF(const SurfaceInteraction& po, double eta, const Material* material); - Spectrum S(const SurfaceInteraction& pi, const Vector3d& wi) const; + Spectrum S(const SurfaceInteraction& pi, const Vector3d& wi) const override; Spectrum sample(const Scene& scene, double rand1, const Point2d& rand2, MemoryArena& arena, SurfaceInteraction* po, double* pdf) const override; diff --git a/test/test_scene.cc b/test/test_scene.cc index e21c6c8..581c45d 100644 --- a/test/test_scene.cc +++ b/test/test_scene.cc @@ -117,9 +117,7 @@ TEST_P(SceneIntersectionTest, BBVHvsQBVH) { Ray ray(f, dir); SurfaceInteraction isect1, isect2; - EXPECT_EQ(scene1.intersect(ray), scene2.intersect(ray)) << - "org : " << ray.org() << std::endl << - "dir : " << ray.dir() << std::endl; + EXPECT_EQ(scene1.intersect(ray), scene2.intersect(ray)); EXPECT_EQ(scene1.intersect(ray, &isect1), scene2.intersect(ray, &isect2)); EXPECT_EQ(isect1.primitive(), isect2.primitive()); EXPECT_EQ(isect1.pos(), isect2.pos());