瀏覽代碼

Fixes compilation error "ResourceSet.h:33:21: error: function 'ResourceSet::ResourceSet()' definition is marked dllimport" when building with g++ 12.1.0

Joakim Thorén 1 年之前
父節點
當前提交
8846fba1fc
共有 2 個文件被更改,包括 3 次插入1 次删除
  1. 2 0
      lib/ResourceSet.cpp
  2. 1 1
      lib/ResourceSet.h

+ 2 - 0
lib/ResourceSet.cpp

@@ -19,6 +19,8 @@
 
 
 VCMI_LIB_NAMESPACE_BEGIN
 VCMI_LIB_NAMESPACE_BEGIN
 
 
+ResourceSet::ResourceSet() = default;
+
 ResourceSet::ResourceSet(const JsonNode & node)
 ResourceSet::ResourceSet(const JsonNode & node)
 {
 {
 	for(auto i = 0; i < GameConstants::RESOURCE_QUANTITY; i++)
 	for(auto i = 0; i < GameConstants::RESOURCE_QUANTITY; i++)

+ 1 - 1
lib/ResourceSet.h

@@ -30,7 +30,7 @@ private:
 public:
 public:
 	// read resources set from json. Format example: { "gold": 500, "wood":5 }
 	// read resources set from json. Format example: { "gold": 500, "wood":5 }
 	DLL_LINKAGE ResourceSet(const JsonNode & node);
 	DLL_LINKAGE ResourceSet(const JsonNode & node);
-	DLL_LINKAGE ResourceSet() = default;
+	DLL_LINKAGE ResourceSet();
 
 
 
 
 #define scalarOperator(OPSIGN)									\
 #define scalarOperator(OPSIGN)									\