Fixed merge

glm/glm.hpp

@@ -44,36 +44,38 @@
 #endif//GLM_MESSAGE
 
 //! GLM namespace, it contains all GLSL based features.
-namespace glm{
+namespace glm
-namespace test
-{
-	bool main_bug();
-	bool main_core();
-}//namespace test
-
-/// GLM core. Namespace that includes all the features define by GLSL 4.10.6 specification. This namespace is included in glm namespace.
-namespace core
 {
-	//! Scalar, vectors and matrices 
+	//! GLM core. Namespace that includes all the feature define by GLSL 4.10.6 specification. This namespace is included in glm namespace.
-	//! from section 4.1.2 Booleans, 4.1.3 Integers section, 4.1.4 Floats section,
+	namespace core
-	//! 4.1.5 Vectors and section 4.1.6 Matrices of GLSL 1.30.8 specification. 
+	{
-	//! This namespace resolves precision qualifier define in section 4.5 of GLSL 1.30.8 specification.
+		//! Scalar, vectors and matrices 
-	namespace type{}
+		//! from section 4.1.2 Booleans, 4.1.3 Integers section, 4.1.4 Floats section,
-
+		//! 4.1.5 Vectors and section 4.1.6 Matrices of GLSL 1.30.8 specification. 
-	//! Some of the functions defined in section 8 Built-in Functions of GLSL 1.30.8 specification.
+		//! This namespace resolves precision qualifier define in section 4.5 of GLSL 1.30.8 specification.
-	//! Angle and trigonometry, exponential, common, geometric, matrix and vector relational functions.
+		namespace type
-	namespace function{}
+		{
-}//namespace core
+			namespace precision{}
-
+		}
-//! G-Truc Creation stable extensions.
+
-namespace gtc{}
+		//! Some of the functions defined in section 8 Built-in Functions of GLSL 1.30.8 specification.
-
+		//! Angle and trigonometry, exponential, common, geometric, matrix and vector relational functions.
-//! G-Truc Creation experimental extensions. 
+		namespace function{}
-//! The interface could change between releases.
+	}//namespace core
-namespace gtx{}
+
-
+	//! G-Truc Creation stable extensions.
-//! VIRTREV extensions.
+	namespace gtc{}
-namespace virtrev{}
+
+	//! G-Truc Creation experimental extensions. 
+	//! The interface could change between releases.
+	namespace gtx{}
+
+	//! VIRTREV extensions.
+	namespace virtrev{}
+
+	using namespace core::type;
+	using namespace core::type::precision;
+	using namespace core::function;
 }//namespace glm
 
 #include "./core/_detail.hpp"
@@ -90,13 +92,6 @@ namespace virtrev{}
 #include "./core/func_noise.hpp"
 #include "./core/_swizzle.hpp"
 
-namespace glm
-{
- 	using namespace core::type;
-	using namespace core::type::precision;
-	using namespace core::function;
-}//namespace glm
-
 ////////////////////
 // check type sizes
 #ifndef GLM_STATIC_ASSERT_NULL