Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-01-28 00:07:09 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed compilation for Clang.

Browse Source
This commit is contained in:
Nyfor 2016-04-04 12:07:09 +02:00
parent d696f72533
commit 5e94c772b3
6 changed files with 19 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
libretroshare/src/grouter/p3grouter.h
View File

@ -225,20 +225,13 @@ private:
void handleLowLevelTransactionAckItem(RsGRouterTransactionAcknItem*) ; void handleLowLevelTransactionAckItem(RsGRouterTransactionAcknItem*) ;
static Sha1CheckSum computeDataItemHash(RsGRouterGenericDataItem *data_item); static Sha1CheckSum computeDataItemHash(RsGRouterGenericDataItem *data_item);
#ifdef __APPLE__
public:
#endif
class nullstream: public std::ostream {};
std::ostream& grouter_debug() const std::ostream& grouter_debug() const
{ {
static nullstream null ; static std::ostream null(0);
return _debug_enabled?(std::cerr):null; return _debug_enabled?(std::cerr):null;
} }
#ifdef __APPLE__
private:
#endif
void routePendingObjects() ; void routePendingObjects() ;
void handleTunnels() ; void handleTunnels() ;
void autoWash() ; void autoWash() ;
@ -364,5 +357,3 @@ private:
uint64_t _random_salt ; uint64_t _random_salt ;
}; };
template<typename T> p3GRouter::nullstream& operator<<(p3GRouter::nullstream& ns,const T&) { return ns ; }

4
libretroshare/src/rsserver/rsinit.cc
View File

@ -366,11 +366,7 @@ int RsInit::InitRetroShare(int argcIgnored, char **argvIgnored, bool strictCheck
#ifdef LOCALNET_TESTING #ifdef LOCALNET_TESTING
>> parameter('R',"restrict-port" ,portRestrictions ,"port1-port2","Apply port restriction" ,false) >> parameter('R',"restrict-port" ,portRestrictions ,"port1-port2","Apply port restriction" ,false)
#endif #endif
#ifdef __APPLE__
>> help('h',"help","Display this Help") ; >> help('h',"help","Display this Help") ;
#else
>> help() ;
#endif
as.defaultErrorHandling(true) ; as.defaultErrorHandling(true) ;

7
libretroshare/src/util/argstream.h
View File

@ -141,15 +141,10 @@ namespace
inline OptionHolder(char s, inline OptionHolder(char s,
const char* l, const char* l,
const char* desc); const char* desc);
#ifdef __APPLE__
friend OptionHolder help(char s, friend OptionHolder help(char s,
const char* l, const char* l,
const char* desc); const char* desc);
#else
friend OptionHolder help(char s='h',
const char* l="help",
const char* desc="Display this help");
#endif
private: private:
std::string shortName_; std::string shortName_;
std::string longName_; std::string longName_;

12
retroshare-gui/src/gui/elastic/graphwidget.cpp
View File

@ -259,7 +259,7 @@ void GraphWidget::keyPressEvent(QKeyEvent *event)
} }
} }
static void convolveWithGaussian(double *forceMap,int S,int /*s*/) static void convolveWithGaussian(double *forceMap,unsigned int S,int /*s*/)
{ {
static double *bf = NULL ; static double *bf = NULL ;
@ -267,8 +267,8 @@ static void convolveWithGaussian(double *forceMap,int S,int /*s*/)
{ {
bf = new double[S*S*2] ; bf = new double[S*S*2] ;
for(int i=0;i<S;++i) for(unsigned int i=0;i<S;++i)
for(int j=0;j<S;++j) for(unsigned int j=0;j<S;++j)
{ {
int x = (i<S/2)?i:(S-i) ; int x = (i<S/2)?i:(S-i) ;
int y = (j<S/2)?j:(S-j) ; int y = (j<S/2)?j:(S-j) ;
@ -284,8 +284,8 @@ static void convolveWithGaussian(double *forceMap,int S,int /*s*/)
unsigned long nn[2] = {S,S}; unsigned long nn[2] = {S,S};
fourn(&forceMap[-1],&nn[-1],2,1) ; fourn(&forceMap[-1],&nn[-1],2,1) ;
for(int i=0;i<S;++i) for(unsigned int i=0;i<S;++i)
for(int j=0;j<S;++j) for(unsigned int j=0;j<S;++j)
{ {
float a = forceMap[2*(i+S*j)]*bf[2*(i+S*j)] - forceMap[2*(i+S*j)+1]*bf[2*(i+S*j)+1] ; float a = forceMap[2*(i+S*j)]*bf[2*(i+S*j)] - forceMap[2*(i+S*j)+1]*bf[2*(i+S*j)+1] ;
float b = forceMap[2*(i+S*j)]*bf[2*(i+S*j)+1] + forceMap[2*(i+S*j)+1]*bf[2*(i+S*j)] ; float b = forceMap[2*(i+S*j)]*bf[2*(i+S*j)+1] + forceMap[2*(i+S*j)+1]*bf[2*(i+S*j)] ;
@ -296,7 +296,7 @@ static void convolveWithGaussian(double *forceMap,int S,int /*s*/)
fourn(&forceMap[-1],&nn[-1],2,-1) ; fourn(&forceMap[-1],&nn[-1],2,-1) ;
for(int i=0;i<S*S*2;++i) for(unsigned int i=0;i<S*S*2;++i)
forceMap[i] /= S*S; forceMap[i] /= S*S;
} }

5
retroshare-nogui/src/retroshare.cc
View File

@ -86,11 +86,8 @@ int main(int argc, char **argv)
// unfinished // unfinished
//args >> parameter("http-listen", listenAddress, "ipv6 address", "Listen only on the specified address.", false); //args >> parameter("http-listen", listenAddress, "ipv6 address", "Listen only on the specified address.", false);
args >> option("http-allow-all", allowAllIps, "allow connections from all IP adresses (default= localhost only)"); args >> option("http-allow-all", allowAllIps, "allow connections from all IP adresses (default= localhost only)");
#ifdef __APPLE__
args >> help('h',"help","Display this Help"); args >> help('h',"help","Display this Help");
#else
args >> help();
#endif
if (args.helpRequested()) if (args.helpRequested())
{ {
std::cerr << args.usage() << std::endl; std::cerr << args.usage() << std::endl;