浏览代码

update: date stamps + GLM_META_PROG_HELPERS pre-requiste

jan p springer 9 年之前
父节点
当前提交
25d6c8e341
共有 2 个文件被更改,包括 6 次插入12 次删除
  1. 3 8
      glm/gtx/io.inl
  2. 3 4
      test/gtx/gtx_io.cpp

+ 3 - 8
glm/gtx/io.inl

@@ -1,7 +1,7 @@
 ///////////////////////////////////////////////////////////////////////////////////
 /// OpenGL Mathematics (glm.g-truc.net)
 ///
-/// Copyright (c) 2005 - 2013 G-Truc Creation (www.g-truc.net)
+/// Copyright (c) 2005 - 2016 G-Truc Creation (www.g-truc.net)
 /// Permission is hereby granted, free of charge, to any person obtaining a copy
 /// of this software and associated documentation files (the "Software"), to deal
 /// in the Software without restriction, including without limitation the rights
@@ -26,20 +26,15 @@
 ///
 /// @ref gtx_io
 /// @file glm/gtx/io.inl
-/// @date 2013-11-22 / 2014-11-25
+/// @date 2013-11-22 / 2016-03-14
 /// @author Jan P Springer ([email protected])
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
-#include <iomanip>                  // std::fixed, std::setfill<>, std::setprecision, std::right,
-                                    // std::setw
+#include <iomanip>                  // std::fixed, std::setfill<>, std::setprecision, std::right, std::setw
 #include <ostream>                  // std::basic_ostream<>
 #include "../gtc/matrix_access.hpp" // glm::col, glm::row
 #include "../gtx/type_trait.hpp"    // glm::type<>
 
-#if !defined(GLM_META_PROG_HELPERS)
-# pragma error("Please define 'GLM_META_PROG_HELPERS' before using GLM_GTX_io")
-#endif
-
 namespace glm{
   namespace io
   {

+ 3 - 4
test/gtx/gtx_io.cpp

@@ -1,7 +1,7 @@
 ///////////////////////////////////////////////////////////////////////////////////
 /// OpenGL Mathematics (glm.g-truc.net)
 ///
-/// Copyright (c) 2005 - 2015 G-Truc Creation (www.g-truc.net)
+/// Copyright (c) 2005 - 2016 G-Truc Creation (www.g-truc.net)
 /// Permission is hereby granted, free of charge, to any person obtaining a copy
 /// of this software and associated documentation files (the "Software"), to deal
 /// in the Software without restriction, including without limitation the rights
@@ -25,11 +25,10 @@
 /// THE SOFTWARE.
 ///
 /// @file test/gtx/gtx_io.cpp
-/// @date 2013-11-22 / 2014-11-25
-/// @author Christophe Riccio
+/// @date 2013-11-22 / 2016-03-14
+/// @author Jan P Springer ([email protected])
 ///////////////////////////////////////////////////////////////////////////////////
 
-#define GLM_META_PROG_HELPERS
 #include <glm/gtc/type_precision.hpp>
 #include <glm/gtx/io.hpp>
 #include <iostream>