MetzNet
/
dfhack
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use typedefs from xlsxio in PluginStatics.h 

The typedefs in the header foward-declared new structs of the same names in the DFHack namespace, e.g. DFHack::xlsxio_read_struct. Apparently the constructors that used these typedefs are not inlined on Windows, so libdfhack was compiled with a constructor taking a "DFHack::xlsxio_read_sheet_struct", and xlsxreader was looking for a constructor taking just a "xlsxio_read_sheet_struct", which didn't exist.
develop
lethosor 2020-09-18 15:05:17 -04:00
parent a4254a4d2c
commit 65b8071941
No known key found for this signature in database
GPG Key ID: 76A269552F4F58C1
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
library/include/PluginStatics.h
Unescape Escape View File

@ -8,6 +8,8 @@
#pragma once #pragma once
#include <xlsxio_read.h>
#include "DataIdentity.h" #include "DataIdentity.h"
namespace DFHack { namespace DFHack {
@ -26,14 +28,12 @@ struct DFHACK_EXPORT xlsx_sheet_handle_identity : public compound_identity {
}; };
struct DFHACK_EXPORT xlsx_file_handle { struct DFHACK_EXPORT xlsx_file_handle {
typedef struct xlsxio_read_struct* xlsxioreader;
const xlsxioreader handle; const xlsxioreader handle;
xlsx_file_handle(xlsxioreader handle): handle(handle) {} xlsx_file_handle(xlsxioreader handle): handle(handle) {}
static xlsx_file_handle_identity _identity; static xlsx_file_handle_identity _identity;
}; };
struct DFHACK_EXPORT xlsx_sheet_handle { struct DFHACK_EXPORT xlsx_sheet_handle {
typedef struct xlsxio_read_sheet_struct* xlsxioreadersheet;
const xlsxioreadersheet handle; const xlsxioreadersheet handle;
xlsx_sheet_handle(xlsxioreadersheet handle): handle(handle) {} xlsx_sheet_handle(xlsxioreadersheet handle): handle(handle) {}
static xlsx_sheet_handle_identity _identity; static xlsx_sheet_handle_identity _identity;