diff --git a/example/CMakeLists.txt b/example/CMakeLists.txt index 69c2caad..f869b0ff 100644 --- a/example/CMakeLists.txt +++ b/example/CMakeLists.txt @@ -1,4 +1,5 @@ add_subdirectory(EnumRenderDevice) add_subdirectory(OutputGLInfo) add_subdirectory(NullWindow) -add_subdirectory(DrawTriangle) +add_subdirectory(DirectGLRender) +# add_subdirectory(DrawTriangle) diff --git a/example/DirectGLRender/CMakeLists.txt b/example/DirectGLRender/CMakeLists.txt new file mode 100644 index 00000000..8b137891 --- /dev/null +++ b/example/DirectGLRender/CMakeLists.txt @@ -0,0 +1 @@ + diff --git a/example/DirectGLRender/main.cpp b/example/DirectGLRender/main.cpp new file mode 100644 index 00000000..e02abfc9 --- /dev/null +++ b/example/DirectGLRender/main.cpp @@ -0,0 +1 @@ + diff --git a/inc/hgl/type/List.h b/inc/hgl/type/List.h index 806d4e74..dc7b4b84 100644 --- a/inc/hgl/type/List.h +++ b/inc/hgl/type/List.h @@ -5,10 +5,6 @@ #include #include -#if defined(__BORLANDC__)||defined(__TURBOC__)||defined(__CODEGEARC__) -#pragma warn -8022 //使hides vitual function警告无效 -#endif// - namespace hgl { /** @@ -64,7 +60,7 @@ namespace hgl virtual void operator += (const T &obj){Add(obj);} ///<操作符重载添加一个数据 virtual void operator << (const T &obj){Add(obj);} ///<操作符重载添加一个数据 - virtual void operator -= (const T &obj){DeleteByValue(obj);} ///<操作符重载删除一个数据 + virtual void operator -= (const T &obj){DeleteByValue(obj);} ///<操作符重载删除一个数据 bool Get(int,T &)const; ///<取得指定索引处的数据 void Set(int,const T &); ///<设置指定索引处的数据