games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-07-15 01:24:45 +02:00
Code Issues Releases Activity

Compile fix for #847

Browse Source
This commit is contained in:
DjWarmonger
2012-01-12 20:41:32 +00:00
parent 86e7d96b39
commit ba646b1d41
4 changed files with 39 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
client/CConfigHandler.h
View File

@ -11,7 +11,6 @@
* Full text of license available in license.txt file, in main folder * Full text of license available in license.txt file, in main folder
* *
*/ */
class Settings; class Settings;
class SettingsListener; class SettingsListener;

4
lib/JsonNode.h
View File

@ -98,7 +98,7 @@ public:
JsonWriter(std::ostream &output, const JsonNode &node); JsonWriter(std::ostream &output, const JsonNode &node);
}; };
std::ostream & operator<<(std::ostream &out, const JsonNode &node); DLL_LINKAGE std::ostream & operator<<(std::ostream &out, const JsonNode &node);
//Tiny string class that uses const char* as data for speed, members are private //Tiny string class that uses const char* as data for speed, members are private
//for ease of debugging and some compatibility with std::string //for ease of debugging and some compatibility with std::string
@ -184,3 +184,5 @@ public:
// validate with external schema // validate with external schema
JsonValidator(JsonNode &root, const JsonNode &schema, bool minimize=false); JsonValidator(JsonNode &root, const JsonNode &schema, bool minimize=false);
}; };

1
lib/NetPacksLib.cpp
View File

@ -550,7 +550,6 @@ DLL_LINKAGE const CArtifactInstance *ArtifactLocation::getArt() const
} }
} }
return NULL; return NULL;
return NULL;
} }
DLL_LINKAGE CArtifactInstance *ArtifactLocation::getArt() DLL_LINKAGE CArtifactInstance *ArtifactLocation::getArt()