BodgeMaster
/
NORM-mirror
mirror of https://github.com/USNavalResearchLaboratory/norm.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

v1.1b9

pull/2/head
Jeff Weston 2019-09-11 11:36:03 -04:00
parent f844ece677
commit b1a42eb629
4 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
VERSION.TXT
View File

@ -1,5 +1,11 @@
NORM Version History NORM Version History
Version 1.1b9
=============
- There have been a number of bug fixes since 1.1b3. This release
fixes a bug in NormBlockBuffer::Remove() and
NormObjectBuffer::Remove(). (Thanks Thava!)
Version 1.1b3 Version 1.1b3
============= =============
- Started keeping version history. This release includes - Started keeping version history. This release includes

4
common/normObject.cpp
View File

@ -2524,7 +2524,7 @@ bool NormObjectTable::Remove(const NormObject* theObject)
offset++; offset++;
if ((entry = table[i])) if ((entry = table[i]))
{ {
NormObjectId id = (UINT16)index + offset; NormObjectId id = (UINT16)objectId + offset;
while(entry && (entry->GetId() != id)) while(entry && (entry->GetId() != id))
{ {
if ((entry->GetId() > objectId) && if ((entry->GetId() > objectId) &&
@ -2560,7 +2560,7 @@ bool NormObjectTable::Remove(const NormObject* theObject)
offset++; offset++;
if ((entry = table[i])) if ((entry = table[i]))
{ {
NormObjectId id = (UINT16)index - offset; NormObjectId id = (UINT16)objectId - offset;
//printf("Looking for id:%lu at index:%lu\n", (UINT16)transport_id, i); //printf("Looking for id:%lu at index:%lu\n", (UINT16)transport_id, i);
while(entry && (entry->GetId() != id)) while(entry && (entry->GetId() != id))
{ {

6
common/normSegment.cpp
View File

@ -856,7 +856,8 @@ bool NormBlockBuffer::Remove(const NormBlock* theBlock)
offset++; offset++;
if ((entry = table[i])) if ((entry = table[i]))
{ {
NormBlockId id = (UINT32)index + offset; //NormBlockId id = (UINT32)index + offset;
NormBlockId id = (UINT32)blockId + offset;
while(entry && (entry->GetId() != id)) while(entry && (entry->GetId() != id))
{ {
if ((entry->GetId() > blockId) && if ((entry->GetId() > blockId) &&
@ -892,7 +893,8 @@ bool NormBlockBuffer::Remove(const NormBlock* theBlock)
offset++; offset++;
if ((entry = table[i])) if ((entry = table[i]))
{ {
NormBlockId id = (UINT32)index - offset; //NormBlockId id = (UINT32)index - offset;
NormBlockId id = (UINT32)blockId - offset;
//printf("Looking for id:%lu at index:%lu\n", (UINT32)id, i); //printf("Looking for id:%lu at index:%lu\n", (UINT32)id, i);
while(entry && (entry->GetId() != id)) while(entry && (entry->GetId() != id))
{ {

2
common/normVersion.h
View File

@ -32,6 +32,6 @@
#ifndef _NORM_VERSION #ifndef _NORM_VERSION
#define _NORM_VERSION #define _NORM_VERSION
#define VERSION "1.1b8" #define VERSION "1.1b9"
#endif // _NORM_VERSION #endif // _NORM_VERSION