Index: head/net-p2p/verlihub/files/patch-c++11 =================================================================== --- head/net-p2p/verlihub/files/patch-c++11 (nonexistent) +++ head/net-p2p/verlihub/files/patch-c++11 (revision 459998) @@ -0,0 +1,71 @@ +libc++ doesn't like "using namespace std" in C++11 + +casyncconn.cpp:585:62: error: invalid operands to binary expression ('__bind' and 'int') + if(bind(sock, (struct sockaddr *)&mAddrIN, sizeof(mAddrIN)) == -1) + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ^ ~~ + +Part of https://github.com/Verlihub/verlihub/commit/60609e646824 + +creguserinfo.cpp:156:32: error: non-constant-expression cannot be narrowed from type 'char' to 'unsigned char' in initializer list [-Wc++11-narrowing] + unsigned char charsalt[2] = {((char*)&str)[0],((char*)&str)[1]}; + ^~~~~~~~~~~~~~~~ +creguserinfo.cpp:156:32: note: insert an explicit cast to silence this issue + unsigned char charsalt[2] = {((char*)&str)[0],((char*)&str)[1]}; + ^~~~~~~~~~~~~~~~ + static_cast( ) +creguserinfo.cpp:156:49: error: non-constant-expression cannot be narrowed from type 'char' to 'unsigned char' in initializer list [-Wc++11-narrowing] + unsigned char charsalt[2] = {((char*)&str)[0],((char*)&str)[1]}; + ^~~~~~~~~~~~~~~~ +creguserinfo.cpp:156:49: note: insert an explicit cast to silence this issue + unsigned char charsalt[2] = {((char*)&str)[0],((char*)&str)[1]}; + ^~~~~~~~~~~~~~~~ + static_cast( ) + +ParseCommand() returns bool since 1.0.0.0. + +script_api.cpp:221:10: error: cannot initialize return object of type 'char *' with an rvalue of type 'bool' + return false; + ^~~~~ +script_api.cpp:226:46: error: cannot initialize return object of type 'char *' with an rvalue of type 'bool' + if ((!usr) || (usr && !usr->mxConn)) return false; + ^~~~~ + +--- src/casyncconn.cpp.orig 2009-07-10 18:23:05 UTC ++++ src/casyncconn.cpp +@@ -575,7 +573,7 @@ int cAsyncConn::BindSocket(int sock, int port, const c + + + /* Bind socket to port */ +- if(bind(sock, (struct sockaddr *)&mAddrIN, sizeof(mAddrIN)) == -1) ++ if(::bind(sock, (struct sockaddr *)&mAddrIN, sizeof(mAddrIN)) == -1) + { + return -1; + } +--- src/creguserinfo.cpp.orig 2009-05-16 14:56:20 UTC ++++ src/creguserinfo.cpp +@@ -153,7 +153,7 @@ void nDirectConnect::nTables::cRegUserInfo::SetPass(st + static const char *saltchars = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmlopqrstuvwxyz0123456789./"; + static const int saltcharsnum = strlen(saltchars); + +- unsigned char charsalt[2] = {((char*)&str)[0],((char*)&str)[1]}; ++ unsigned char charsalt[2] = {(unsigned char)((char*)&str)[0], (unsigned char)((char*)&str)[1]}; + + #if HAVE_LIBSSL && HAVE_OPENSSL_MD5_H + unsigned char buf[MD5_DIGEST_LENGTH+1]; +--- src/script_api.cpp.orig 2009-05-16 14:42:07 UTC ++++ src/script_api.cpp +@@ -218,12 +218,12 @@ char * ParseCommand(char *command_line) + cServerDC *server = GetCurrentVerlihub(); + if(!server) { + cerr << "Server verlihub is unfortunately not running or not found." << endl; +- return false; ++ return NULL; + } + cUser *usr = GetUser((char *) server->mC.hub_security.c_str()); + printf("%p\n", usr); + printf("%p", usr->mxConn); +- if ((!usr) || (usr && !usr->mxConn)) return false; ++ if ((!usr) || (usr && !usr->mxConn)) return NULL; + cout << "here" << endl; + if (!server->mP.ParseForCommands(command_line, usr->mxConn)) { + // unknown command Property changes on: head/net-p2p/verlihub/files/patch-c++11 ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property