erase warning: clang

This commit is contained in:
bolero-MURAKAMI 2013-04-21 13:30:30 +09:00
parent fb4fb791dd
commit 61720b72c3
18 changed files with 108 additions and 1 deletions

View file

@ -19,6 +19,10 @@ namespace sprout {
} // namespace sprout
namespace std {
#if defined(__clang__)
# pragma clang diagnostic push
# pragma clang diagnostic ignored "-Wmismatched-tags"
#endif
//
// hash
//
@ -26,6 +30,9 @@ namespace std {
struct hash<sprout::array<T, N> >
: public sprout::hash<sprout::array<T, N> >
{};
#if defined(__clang__)
# pragma clang diagnostic pop
#endif
} // namespace std
#endif // #ifndef SPROUT_ARRAY_HASH_HPP

View file

@ -20,6 +20,10 @@ namespace sprout {
} // namespace sprout
namespace std {
#if defined(__clang__)
# pragma clang diagnostic push
# pragma clang diagnostic ignored "-Wmismatched-tags"
#endif
//
// hash
//
@ -27,6 +31,9 @@ namespace std {
struct hash<sprout::bitset<N> >
: public sprout::hash<sprout::bitset<N> >
{};
#if defined(__clang__)
# pragma clang diagnostic pop
#endif
} // namespace std
#endif // #ifndef SPROUT_BITSET_HASH_HPP

View file

@ -19,6 +19,10 @@ namespace sprout {
} // namespace sprout
namespace std {
#if defined(__clang__)
# pragma clang diagnostic push
# pragma clang diagnostic ignored "-Wmismatched-tags"
#endif
//
// hash
//
@ -26,6 +30,9 @@ namespace std {
struct hash<sprout::complex<T> >
: public sprout::hash<sprout::complex<T> >
{};
#if defined(__clang__)
# pragma clang diagnostic pop
#endif
} // namespace std
#endif // #ifndef SPROUT_COMPLEX_HASH_HPP

View file

@ -5,5 +5,6 @@
#include <sprout/darkroom/objects/intersect.hpp>
#include <sprout/darkroom/objects/sphere.hpp>
#include <sprout/darkroom/objects/aa_plane.hpp>
#include <sprout/darkroom/objects/polygon.hpp>
#endif // #ifndef SPROUT_DARKROOM_OBJECTS_HPP

View file

@ -64,7 +64,7 @@ namespace sprout {
? sprout::darkroom::rays::point_of_intersection(ray, distance)
: position_type(0, 0, 0)
,
hit_side > 0 ? normal_ : sprout::darkroom::coords::negate(normal_),
normal_,//hit_side > 0 ? normal_ : sprout::darkroom::coords::negate(normal_),
sprout::darkroom::materials::calc_material(mat_, unit_type(0), unit_type(0)) // ???
);
}

View file

@ -27,6 +27,10 @@ namespace sprout {
} // namespace sprout
namespace std {
#if defined(__clang__)
# pragma clang diagnostic push
# pragma clang diagnostic ignored "-Wmismatched-tags"
#endif
//
// hash
//
@ -38,6 +42,9 @@ namespace std {
struct hash<sprout::logic::tribool>
: public sprout::hash<sprout::logic::tribool>
{};
#if defined(__clang__)
# pragma clang diagnostic pop
#endif
} // namespace std
#endif // #ifndef SPROUT_LOGIC_TRIBOOL_HASH_HPP

View file

@ -2,6 +2,7 @@
#define SPROUT_MATH_FACTORIAL_HPP
#include <cstddef>
#include <cstdint>
#include <type_traits>
#include <sprout/config.hpp>
#include <sprout/array/array.hpp>

View file

@ -21,6 +21,10 @@ namespace sprout {
} // namespace sprout
namespace std {
#if defined(__clang__)
# pragma clang diagnostic push
# pragma clang diagnostic ignored "-Wmismatched-tags"
#endif
//
// hash
//
@ -28,6 +32,9 @@ namespace std {
struct hash<sprout::optional<T> >
: public sprout::hash<sprout::optional<T> >
{};
#if defined(__clang__)
# pragma clang diagnostic pop
#endif
} // namespace std
#endif // #ifndef SPROUT_OPTIONAL_HASH_HPP

View file

@ -19,6 +19,10 @@ namespace sprout {
} // namespace sprout
namespace std {
#if defined(__clang__)
# pragma clang diagnostic push
# pragma clang diagnostic ignored "-Wmismatched-tags"
#endif
//
// hash
//
@ -26,6 +30,9 @@ namespace std {
struct hash<sprout::pit<Container> >
: public sprout::hash<sprout::pit<Container> >
{};
#if defined(__clang__)
# pragma clang diagnostic pop
#endif
} // namespace std
#endif // #ifndef SPROUT_PIT_HASH_HPP

View file

@ -19,6 +19,10 @@ namespace sprout {
} // namespace sprout
namespace std {
#if defined(__clang__)
# pragma clang diagnostic push
# pragma clang diagnostic ignored "-Wmismatched-tags"
#endif
//
// hash
//
@ -26,6 +30,9 @@ namespace std {
struct hash<sprout::rational<T> >
: public sprout::hash<sprout::rational<T> >
{};
#if defined(__clang__)
# pragma clang diagnostic pop
#endif
} // namespace std
#endif // SPROUT_RATIONAL_HASH_HPP

View file

@ -19,6 +19,10 @@ namespace sprout {
} // namespace sprout
namespace std {
#if defined(__clang__)
# pragma clang diagnostic push
# pragma clang diagnostic ignored "-Wmismatched-tags"
#endif
//
// hash
//
@ -26,6 +30,9 @@ namespace std {
struct hash<sprout::basic_string<T, N, Traits> >
: public sprout::hash<sprout::basic_string<T, N, Traits> >
{};
#if defined(__clang__)
# pragma clang diagnostic pop
#endif
} // namespace std
#endif // #ifndef SPROUT_STRING_HASH_HPP

View file

@ -19,6 +19,10 @@ namespace sprout {
} // namespace sprout
namespace std {
#if defined(__clang__)
# pragma clang diagnostic push
# pragma clang diagnostic ignored "-Wmismatched-tags"
#endif
//
// hash
//
@ -26,6 +30,9 @@ namespace std {
struct hash<sprout::sub_array<Container> >
: public sprout::hash<sprout::sub_array<Container> >
{};
#if defined(__clang__)
# pragma clang diagnostic pop
#endif
} // namespace std
#endif // #ifndef SPROUT_SUB_ARRAY_HASH_HPP

View file

@ -33,6 +33,10 @@ namespace sprout {
} // namespace sprout
namespace std {
#if defined(__clang__)
# pragma clang diagnostic push
# pragma clang diagnostic ignored "-Wmismatched-tags"
#endif
//
// hash
//
@ -40,6 +44,9 @@ namespace std {
struct hash<sprout::tuples::tuple<Types...> >
: public sprout::hash<sprout::tuples::tuple<Types...> >
{};
#if defined(__clang__)
# pragma clang diagnostic pop
#endif
} // namespace std
#endif // #ifndef SPROUT_TUPLE_TUPLE_HASH_HPP

View file

@ -19,6 +19,10 @@ namespace sprout {
} // namespace sprout
namespace std {
#if defined(__clang__)
# pragma clang diagnostic push
# pragma clang diagnostic ignored "-Wmismatched-tags"
#endif
//
// hash
//
@ -26,6 +30,9 @@ namespace std {
struct hash<sprout::pair<T1, T2> >
: public sprout::hash<sprout::pair<T1, T2> >
{};
#if defined(__clang__)
# pragma clang diagnostic pop
#endif
} // namespace std
#endif // #ifndef SPROUT_UTILITY_PAIR_HASH_HPP

View file

@ -19,6 +19,10 @@ namespace sprout {
} // namespace sprout
namespace std {
#if defined(__clang__)
# pragma clang diagnostic push
# pragma clang diagnostic ignored "-Wmismatched-tags"
#endif
//
// hash
//
@ -26,6 +30,9 @@ namespace std {
struct hash<sprout::basic_string_ref<T, Traits> >
: public sprout::hash<sprout::basic_string_ref<T, Traits> >
{};
#if defined(__clang__)
# pragma clang diagnostic pop
#endif
} // namespace std
#endif // #ifndef SPROUT_UTILITY_STRING_REF_HASH_HPP

View file

@ -27,6 +27,10 @@ namespace sprout {
} // namespace sprout
namespace std {
#if defined(__clang__)
# pragma clang diagnostic push
# pragma clang diagnostic ignored "-Wmismatched-tags"
#endif
//
// hash
//
@ -34,6 +38,9 @@ namespace std {
struct hash<sprout::value_holder<T> >
: public sprout::hash<sprout::value_holder<T> >
{};
#if defined(__clang__)
# pragma clang diagnostic pop
#endif
} // namespace std
#endif // #ifndef SPROUT_UTILITY_VALUE_HOLDER_HASH_HPP

View file

@ -18,6 +18,10 @@ namespace sprout {
} // namespace sprout
namespace std {
#if defined(__clang__)
# pragma clang diagnostic push
# pragma clang diagnostic ignored "-Wmismatched-tags"
#endif
//
// hash
//
@ -25,6 +29,9 @@ namespace std {
struct hash<sprout::uuids::uuid>
: public sprout::hash<sprout::uuids::uuid>
{};
#if defined(__clang__)
# pragma clang diagnostic pop
#endif
} // namespace std
#endif // #ifndef SPROUT_UUID_HASH_HPP

View file

@ -35,6 +35,10 @@ namespace sprout {
} // namespace sprout
namespace std {
#if defined(__clang__)
# pragma clang diagnostic push
# pragma clang diagnostic ignored "-Wmismatched-tags"
#endif
//
// hash
//
@ -42,6 +46,9 @@ namespace std {
struct hash<sprout::variant<Types...> >
: public sprout::hash<sprout::variant<Types...> >
{};
#if defined(__clang__)
# pragma clang diagnostic pop
#endif
} // namespace std
#endif // #ifndef SPROUT_VARIANT_HASH_HPP