mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-12-31 05:41:08 +00:00
Code Issues Releases Activity

- Fix build with new libc++

Browse Source 
PR:		196652
Submitted by:	dim
This commit is contained in:
Dmitry Marakasov 2015-01-25 01:41:04 +00:00
parent 4a7c114a7b
commit 82d109bcf5
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=377854
3 changed files with 82 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
games/xmoto/files/patch-src-GameInit.cpp Normal file
View File

@ -0,0 +1,11 @@
--- src/GameInit.cpp.orig 2015-01-10 18:22:36.000000000 +0100
+++ src/GameInit.cpp 2015-01-10 18:27:28.000000000 +0100
@@ -248,7 +248,7 @@ void GameApp::run_load(int nNumArgs, cha
Logger::setActiv(XMSession::instance()->noLog() == false); /* apply log activ mode */
LogInfo(std::string("X-Moto " + XMBuild::getVersionString(true)).c_str());
- LogInfo("compiled at "__DATE__" "__TIME__);
+ LogInfo("compiled at " __DATE__ " " __TIME__);
if(SwapEndian::bigendien) {
LogInfo("Systeme is bigendien");
} else {

47
games/xmoto/files/patch-src-WWW.cpp Normal file
View File

@ -0,0 +1,47 @@
--- src/WWW.cpp.orig 2015-01-10 18:11:22.000000000 +0100
+++ src/WWW.cpp 2015-01-10 18:21:32.000000000 +0100
@@ -206,7 +206,7 @@ void FSWeb::downloadFile(const std::stri
std::string v_www_agent = WWW_AGENT;
/* open the file */
- if( (v_destinationFile = fopen(v_local_file_tmp.c_str(), "wb")) == false) {
+ if( (v_destinationFile = fopen(v_local_file_tmp.c_str(), "wb")) == NULL) {
throw Exception("error : unable to open output file "
+ v_local_file_tmp);
}
@@ -320,7 +320,7 @@ void FSWeb::uploadReplay(const std::stri
LogInfo(std::string("Uploading replay " + p_replayFilename).c_str());
/* open the file */
- if( (v_destinationFile = fopen(v_local_file.c_str(), "wb")) == false) {
+ if( (v_destinationFile = fopen(v_local_file.c_str(), "wb")) == NULL) {
throw Exception("error : unable to open output file " DEFAULT_WWW_MSGFILE("UR"));
}
@@ -478,7 +478,7 @@ void FSWeb::sendVote(const std::string&
LogInfo("Sending vote");
/* open the file */
- if( (v_destinationFile = fopen(v_local_file.c_str(), "wb")) == false) {
+ if( (v_destinationFile = fopen(v_local_file.c_str(), "wb")) == NULL) {
throw Exception("error : unable to open output file " DEFAULT_WWW_MSGFILE("SV"));
}
@@ -562,7 +562,7 @@ void FSWeb::sendReport(const std::string
LogInfo("Sending report");
/* open the file */
- if( (v_destinationFile = fopen(v_local_file.c_str(), "wb")) == false) {
+ if( (v_destinationFile = fopen(v_local_file.c_str(), "wb")) == NULL) {
throw Exception("error : unable to open output file " DEFAULT_WWW_MSGFILE("SR"));
}
@@ -677,7 +677,7 @@ void FSWeb::uploadDbSync(const std::stri
LogInfo(std::string("Uploading dbsync " + p_dbSyncFilename + " to " + p_url_to_transfert).c_str());
/* open the file */
- if( (v_destinationFile = fopen(p_answerFile.c_str(), "wb")) == false) {
+ if( (v_destinationFile = fopen(p_answerFile.c_str(), "wb")) == NULL) {
throw Exception("error : unable to open output file " + p_answerFile);
}

31
games/xmoto/files/patch-src-include-xm__hashmap.h
View File

@ -1,11 +1,28 @@
--- src/include/xm_hashmap.h.orig 2011-10-12 00:18:17.000000000 +0400
+++ src/include/xm_hashmap.h 2013-09-13 22:30:46.334969348 +0400
@@ -14,7 +14,7 @@
--- src/include/xm_hashmap.h.orig 2015-01-12 23:04:54.000000000 +0100
+++ src/include/xm_hashmap.h 2015-01-12 23:07:53.000000000 +0100
@@ -13,13 +13,18 @@
#include <hash_map>
namespace HashNamespace=std;
#endif
struct hashcmp_str {
-struct hashcmp_str {
- bool operator()(const char* s1, const char* s2) {
+ bool operator()(const char* s1, const char* s2) const {
if(s1 == NULL || s2 == NULL) {
return false;
- if(s1 == NULL || s2 == NULL) {
- return false;
+
+#ifdef _LIBCPP_VERSION
+namespace __gnu_cxx {
+ template<> struct hash<std::string>
+ : public unary_function<std::string, size_t>
+ {
+ size_t operator()(const std::string& s) const
+ {
+ return hash<const char*>()(s.c_str());
}
- return strcmp(s1, s2) == 0;
- }
-};
+ };
+}
+#endif // _LIBCPP_VERSION
#endif