diff --git a/CMCore b/CMCore index 6107f34e..fb3f8b1c 160000 --- a/CMCore +++ b/CMCore @@ -1 +1 @@ -Subproject commit 6107f34e21e5f104091d28b3db17e6cbeb7dc967 +Subproject commit fb3f8b1c8631fbd168b1590a83f9d5431f359240 diff --git a/CMPlatform b/CMPlatform index e12b8a9e..984d9698 160000 --- a/CMPlatform +++ b/CMPlatform @@ -1 +1 @@ -Subproject commit e12b8a9e5c5a65b4662a4c02fb5c7c67558a4490 +Subproject commit 984d9698ef873a08f0c99579e8a9b4bf15e5ce5f diff --git a/inc/hgl/graph/VertexBuffer.h b/inc/hgl/graph/VertexBuffer.h index 3465ec2a..ef73f2b5 100644 --- a/inc/hgl/graph/VertexBuffer.h +++ b/inc/hgl/graph/VertexBuffer.h @@ -53,7 +53,7 @@ namespace hgl { if(!mem_type||offset>=count) { - LOG_HINT(OS_TEXT("VertexBuffer::Get() out,offset:")+OSString(offset)); + LOG_HINT(OS_TEXT("VertexBuffer::Get() out,offset:")+OSString::valueOf(offset)); return(nullptr); } @@ -69,7 +69,7 @@ namespace hgl { if(access) { - LOG_HINT(OS_TEXT("VertexBuffer::Begin() access!=0,offset:")+OSString(offset)); + LOG_HINT(OS_TEXT("VertexBuffer::Begin() access!=0,offset:")+OSString::valueOf(offset)); return(nullptr); } @@ -99,7 +99,7 @@ namespace hgl { if(!this->access||this->access+C*number>this->mem_end) { - LOG_HINT(OS_TEXT("VertexBuffer::Write(const T *,number) out,number:")+OSString(number)); + LOG_HINT(OS_TEXT("VertexBuffer::Write(const T *,number) out,number:")+OSString::valueOf(number)); return(false); } @@ -184,7 +184,7 @@ namespace hgl { if(!this->access||this->access+count>this->mem_end) { - LOG_HINT(OS_TEXT("VertexBuffer1::Write(const T,")+OSString(count)+OS_TEXT(") out")); + LOG_HINT(OS_TEXT("VertexBuffer1::Write(const T,")+OSString::valueOf(count)+OS_TEXT(") out")); return(false); } @@ -301,7 +301,7 @@ namespace hgl { if(!this->access||this->access+(count<<1)>this->mem_end) { - LOG_HINT(OS_TEXT("VertexBuffer1::Write(const Vector2f &,")+OSString(count)+OS_TEXT(") out")); + LOG_HINT(OS_TEXT("VertexBuffer1::Write(const Vector2f &,")+OSString::valueOf(count)+OS_TEXT(") out")); return(false); } @@ -596,7 +596,7 @@ namespace hgl { if(!this->access||this->access+(count*3)>this->mem_end) { - LOG_HINT(OS_TEXT("VertexBuffer3::Write(const Vector3f,")+OSString(count)+OS_TEXT(") out")); + LOG_HINT(OS_TEXT("VertexBuffer3::Write(const Vector3f,")+OSString::valueOf(count)+OS_TEXT(") out")); return(false); } @@ -620,7 +620,7 @@ namespace hgl { if(!this->access||this->access+(count*3)>this->mem_end) { - LOG_HINT(OS_TEXT("VertexBuffer3::Write(const Vector3f,")+OSString(count)+OS_TEXT(") out")); + LOG_HINT(OS_TEXT("VertexBuffer3::Write(const Vector3f,")+OSString::valueOf(count)+OS_TEXT(") out")); return(false); } @@ -901,7 +901,7 @@ namespace hgl { if(!this->access||this->access+(count<<2)>this->mem_end) { - LOG_HINT(OS_TEXT("VertexBuffer4::Write(const Vector4f,")+OSString(count)+OS_TEXT(") out")); + LOG_HINT(OS_TEXT("VertexBuffer4::Write(const Vector4f,")+OSString::valueOf(count)+OS_TEXT(") out")); return(false); } @@ -926,7 +926,7 @@ namespace hgl { if(!this->access||this->access+(count<<2)>this->mem_end) { - LOG_HINT(OS_TEXT("VertexBuffer4::Write(const Vector4f,")+OSString(count)+OS_TEXT(") out")); + LOG_HINT(OS_TEXT("VertexBuffer4::Write(const Vector4f,")+OSString::valueOf(count)+OS_TEXT(") out")); return(false); }