Fixes for MSVC build errors.

peterix · peterix · commit f2f79e0c0911 · 2011-02-21T10:25:21.000+01:00
diff --git a/tools/supported/SegmentedFinder.h b/tools/supported/SegmentedFinder.h
@@ -393,7 +393,7 @@ class Bytestream
             return false;
         if(d->length+sizeof(T) >= d->allocated)
             Allocate((d->length+sizeof(T)) * 2);
-        (*(T *)(d->object + d->length)) = what;
+        (*(T *)( (uint64_t)d->object + d->length)) = what;
         d->length += sizeof(T);
     }
     Bytestreamdata * d;
diff --git a/tools/supported/autosearch.cpp b/tools/supported/autosearch.cpp
@@ -59,6 +59,7 @@ class Token
     virtual bool AcquireOffset(DFHack::VersionInfo * vinfo)
     {
         vinfo->getOffset(full_offset_name);
+        return true;
     }
     virtual uint32_t Length() = 0;
     virtual uint64_t getAbsolute(){if(parent) return parent->getAbsolute() + offset; else return offset;};

Original file line number	Diff line number	Diff line change
`@@ -393,7 +393,7 @@ class Bytestream`
`393`	`393`	`return false;`
`394`	`394`	`if(d->length+sizeof(T) >= d->allocated)`
`395`	`395`	`Allocate((d->length+sizeof(T)) * 2);`
`396`		`- ((T )(d->object + d->length)) = what;`
	`396`	`+ ((T )( (uint64_t)d->object + d->length)) = what;`
`397`	`397`	`d->length += sizeof(T);`
`398`	`398`	`}`
`399`	`399`	`Bytestreamdata * d;`
Original file line number	Diff line number	Diff line change
`@@ -59,6 +59,7 @@ class Token`
`59`	`59`	`virtual bool AcquireOffset(DFHack::VersionInfo * vinfo)`
`60`	`60`	`{`
`61`	`61`	`vinfo->getOffset(full_offset_name);`
	`62`	`+ return true;`
`62`	`63`	`}`
`63`	`64`	`virtual uint32_t Length() = 0;`
`64`	`65`	`virtual uint64_t getAbsolute(){if(parent) return parent->getAbsolute() + offset; else return offset;};`