diff --git a/DistributionChart2D.cpp b/DistributionChart2D.cpp index 75058e4..4a8b794 100644 --- a/DistributionChart2D.cpp +++ b/DistributionChart2D.cpp @@ -139,7 +139,7 @@ bool ParsePosition(Vector2i *result,const U8String &str) return(true); } -using OnePositionData=List; +using OnePositionData=ArrayList; struct LineSegment { @@ -147,7 +147,7 @@ struct LineSegment Vector2i end; }; -using LineSegmentData=List; +using LineSegmentData=ArrayList; bool ParseLineSegment(LineSegment *result,const U8String &str) { @@ -189,7 +189,7 @@ bool ParseLineSegment(LineSegment *result,const U8String &str) } template -void ParseStringList(List &data_list,const U8StringList &sl,bool (*ParseLineFunc)(T *,const U8String &)) +void ParseStringList(ArrayList &data_list,const U8StringList &sl,bool (*ParseLineFunc)(T *,const U8String &)) { const uint count=sl.GetCount(); diff --git a/PlayerTraceChart2D.cpp b/PlayerTraceChart2D.cpp index 08036a6..f46b03b 100644 --- a/PlayerTraceChart2D.cpp +++ b/PlayerTraceChart2D.cpp @@ -25,7 +25,7 @@ constexpr const uint ICON_SIZE=8; BitmapRGB8 *BackgroundBitmap=nullptr; DrawGeometryRGB8 *draw_bmp=nullptr; -using TraceList=List; +using TraceList=ArrayList; ObjectMap PlayerTrace; //玩家轨迹 diff --git a/datatype/IDNameTest.cpp b/datatype/IDNameTest.cpp index f7f5fe1..9ad5c49 100644 --- a/datatype/IDNameTest.cpp +++ b/datatype/IDNameTest.cpp @@ -5,11 +5,11 @@ int main(int,char **) { using namespace hgl; - AnsiIDName id3("id1"); - AnsiIDName id4("id2"); + AIDName id3("id1"); + AIDName id4("id2"); - AnsiIDName id5("id1"); - AnsiIDName id6("id2"); + AIDName id5("id1"); + AIDName id6("id2"); std::cout< dis_un_count(BLOCK_SIZE/10,BLOCK_SIZE/4); uniform_int_distribution dis_block_count(1,BLOCK_SIZE/10); - List user_node_list; + ArrayList user_node_list; int free_count=dc.GetFreeCount(); do diff --git a/datatype/collection/PoolTest.cpp b/datatype/collection/PoolTest.cpp index 8404b27..685b54f 100644 --- a/datatype/collection/PoolTest.cpp +++ b/datatype/collection/PoolTest.cpp @@ -73,7 +73,7 @@ void ObjectPoolTest() { ObjectPool pool; - List release_list; + ArrayList release_list; //添加所有的人物数据到池中 { diff --git a/datatype/typeinfo/ObjectRelationTest.cpp b/datatype/typeinfo/ObjectRelationTest.cpp index d94cebe..6549b1a 100644 --- a/datatype/typeinfo/ObjectRelationTest.cpp +++ b/datatype/typeinfo/ObjectRelationTest.cpp @@ -59,7 +59,7 @@ public: template inline const bool IsType(BaseObject *bo){return bo?(bo->GetTypeHash()==T::StaticTypeHash()):false;} -inline const bool TypeEqual(BaseObject *bo1,BaseObject *bo2) +inline const bool IsSameType(BaseObject *bo1,BaseObject *bo2) { if(!bo1||!bo2)return(false); @@ -93,12 +93,12 @@ void test1() std::cout<<"IsType(bo) result is "<<(result?"true":"false")<; +using ObjectBaseInfoSet=tsl::robin_set; template class RefPtr; @@ -109,8 +109,8 @@ template class RefObject { T *obj; - ObjectSimpleInfoSet ref_me_set; ///<引用我的对象 - ObjectSimpleInfoSet me_ref_set; ///<我引用的对象 + ObjectBaseInfoSet ref_me_set; ///<引用我的对象 + ObjectBaseInfoSet me_ref_set; ///<我引用的对象 template friend class RefPtr; diff --git a/datatype/typeinfo/TypeCheck.cpp b/datatype/typeinfo/TypeCheck.cpp index 0e73f8a..2f0cc07 100644 --- a/datatype/typeinfo/TypeCheck.cpp +++ b/datatype/typeinfo/TypeCheck.cpp @@ -1,48 +1,40 @@ #include -#include +#include using namespace hgl; +using namespace std; -class Base +void out(const char *name,Object *obj) { - ObjectBaseInfo obj_base_info; ///<对象基本信息 + cout<GetTypeName()<<": "<GetTypeHash()< class Inherit:public T +class TestObjectA:public TestObject { - size_t hash_code; + HGL_OBJECT_BODY(TestObjectA) public: - Inherit() - { - hash_code=GetTypeHash(); - } - - const size_t GetClassTypeHash()const noexcept{return hash_code;} -}; - -class TestA:public Inherit -{ - -public: + HGL_OBJECT_CONSTRUCT_SC(TestObjectA,TestObject) }; -int main() +int main(int,char **) { - TestA test; + TestObject *to=NewObject(TestObject); + TestObjectA *toa=NewObject(TestObjectA); - std::cout<<"Base1: "< void out_series_pool(const SeriesPool &sp) cout< void out_list(const List &l) +template void out_list(const ArrayList &l) { cout<<"List("< void out_list(const List &l) int os_main(int,os_char **) { SeriesU8 series_pool(POOL_MAX_COUNT); //序号池 - List tmp_list; //临时序号列表 + ArrayList tmp_list; //临时序号列表 tmp_list.PreAlloc(POOL_MAX_COUNT); //预分配空间(注:没有数据,只是预分配空间,减少未来内存分配次数而己)