Fixed namespace issues

This commit is contained in:
Christophe Riccio
2011-06-06 22:06:16 +01:00
parent b9ab6d94cc
commit 5acf2d84a0
20 changed files with 60 additions and 25 deletions

View File

@@ -40,8 +40,7 @@
#endif
namespace glm{
namespace gtc{
namespace swizzle ///< GLM_GTC_swizzle extension
namespace gtc
{
using namespace gtc::half_float;
@@ -361,12 +360,10 @@ namespace swizzle ///< GLM_GTC_swizzle extension
static_swizzle4_ref(glm::u32, 4)
static_swizzle4_ref(glm::u64, 4)
}//namespace swizzle
}//namespace gtc
}//namespace glm
#include "swizzle.inl"
namespace glm{using namespace gtc::swizzle;}
#endif//glm_gtc_swizzle

View File

@@ -12,7 +12,6 @@
namespace glm{
namespace gtc{
namespace swizzle{
template <typename T, template <typename> class vecType>
GLM_FUNC_QUALIFIER T swizzle
@@ -172,6 +171,6 @@ GLM_FUNC_QUALIFIER detail::tref4<int> swizzle
return detail::tref4<int>(v[x], v[y], v[z], v[w]);
}
*/
}//namespace swizzle
}//namespace gtc
}//namespace glm