mirror of
https://github.com/RetroShare/RetroShare.git
synced 2024-12-25 23:49:35 -05:00
Removed std::stringstream.
Removed not necessary include <sstream>. git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5112 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
parent
4e26884646
commit
a6dfac2a37
@ -30,7 +30,6 @@
|
|||||||
|
|
||||||
#include <iostream>
|
#include <iostream>
|
||||||
#include <iomanip>
|
#include <iomanip>
|
||||||
#include <sstream>
|
|
||||||
|
|
||||||
|
|
||||||
#define LPF_FACTOR (0.90)
|
#define LPF_FACTOR (0.90)
|
||||||
|
@ -35,7 +35,6 @@
|
|||||||
#include <string.h>
|
#include <string.h>
|
||||||
|
|
||||||
#include <iostream>
|
#include <iostream>
|
||||||
#include <sstream>
|
|
||||||
#include <iomanip>
|
#include <iomanip>
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -33,7 +33,6 @@
|
|||||||
|
|
||||||
#include <iostream>
|
#include <iostream>
|
||||||
#include <iomanip>
|
#include <iomanip>
|
||||||
#include <sstream>
|
|
||||||
|
|
||||||
|
|
||||||
#define BITDHT_QUERY_START_PEERS 10
|
#define BITDHT_QUERY_START_PEERS 10
|
||||||
|
@ -35,7 +35,6 @@
|
|||||||
#include <limits.h>
|
#include <limits.h>
|
||||||
|
|
||||||
#include <iostream>
|
#include <iostream>
|
||||||
#include <sstream>
|
|
||||||
#include <iomanip>
|
#include <iomanip>
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -27,7 +27,6 @@
|
|||||||
#include "util/bdbloom.h"
|
#include "util/bdbloom.h"
|
||||||
#include "bitdht/bdstddht.h"
|
#include "bitdht/bdstddht.h"
|
||||||
#include <iostream>
|
#include <iostream>
|
||||||
#include <sstream>
|
|
||||||
|
|
||||||
#define N_TESTS 100
|
#define N_TESTS 100
|
||||||
|
|
||||||
|
@ -27,7 +27,6 @@
|
|||||||
#include "util/bdbloom.h"
|
#include "util/bdbloom.h"
|
||||||
#include "bitdht/bdstddht.h"
|
#include "bitdht/bdstddht.h"
|
||||||
#include <iostream>
|
#include <iostream>
|
||||||
#include <sstream>
|
|
||||||
|
|
||||||
#define N_TESTS 100
|
#define N_TESTS 100
|
||||||
|
|
||||||
|
@ -33,7 +33,6 @@
|
|||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
#include <unistd.h> /* for usleep() */
|
#include <unistd.h> /* for usleep() */
|
||||||
#include <iostream>
|
#include <iostream>
|
||||||
#include <sstream>
|
|
||||||
#include <iomanip>
|
#include <iomanip>
|
||||||
|
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
|
@ -26,7 +26,6 @@
|
|||||||
#include "udp/udpstack.h"
|
#include "udp/udpstack.h"
|
||||||
|
|
||||||
#include <iostream>
|
#include <iostream>
|
||||||
#include <sstream>
|
|
||||||
#include <iomanip>
|
#include <iomanip>
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
|
@ -28,7 +28,6 @@
|
|||||||
#include "util/rsdir.h"
|
#include "util/rsdir.h"
|
||||||
|
|
||||||
#include <iostream>
|
#include <iostream>
|
||||||
#include <sstream>
|
|
||||||
#include <iomanip>
|
#include <iomanip>
|
||||||
|
|
||||||
/****
|
/****
|
||||||
|
@ -30,7 +30,6 @@
|
|||||||
#include "tcponudp/udpstunner.h"
|
#include "tcponudp/udpstunner.h"
|
||||||
#include "bitdht/bdstddht.h"
|
#include "bitdht/bdstddht.h"
|
||||||
|
|
||||||
#include <sstream>
|
|
||||||
|
|
||||||
void convertBdPeerToRsDhtPeer(RsDhtPeer &peer, const bdPeer &int_peer);
|
void convertBdPeerToRsDhtPeer(RsDhtPeer &peer, const bdPeer &int_peer);
|
||||||
void convertDhtPeerDetailsToRsDhtNetPeer(RsDhtNetPeer &status, const DhtPeerDetails &details);
|
void convertDhtPeerDetailsToRsDhtNetPeer(RsDhtNetPeer &status, const DhtPeerDetails &details);
|
||||||
|
@ -3,7 +3,6 @@
|
|||||||
|
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
#include <iostream>
|
#include <iostream>
|
||||||
#include <sstream>
|
|
||||||
|
|
||||||
|
|
||||||
#include "bitdht/bdiface.h"
|
#include "bitdht/bdiface.h"
|
||||||
|
@ -25,7 +25,6 @@
|
|||||||
|
|
||||||
#include <unistd.h> /* for (u)sleep() */
|
#include <unistd.h> /* for (u)sleep() */
|
||||||
#include <iostream>
|
#include <iostream>
|
||||||
#include <sstream>
|
|
||||||
#include "util/rsdebug.h"
|
#include "util/rsdebug.h"
|
||||||
#include "util/rsdir.h"
|
#include "util/rsdir.h"
|
||||||
#include "retroshare/rstypes.h"
|
#include "retroshare/rstypes.h"
|
||||||
|
@ -36,7 +36,6 @@
|
|||||||
#include <util/pgpkey.h>
|
#include <util/pgpkey.h>
|
||||||
#include <unistd.h> /* for (u)sleep() */
|
#include <unistd.h> /* for (u)sleep() */
|
||||||
#include <iostream>
|
#include <iostream>
|
||||||
#include <sstream>
|
|
||||||
#include <algorithm>
|
#include <algorithm>
|
||||||
#include "serialiser/rsconfigitems.h"
|
#include "serialiser/rsconfigitems.h"
|
||||||
#include "cleanupxpgp.h"
|
#include "cleanupxpgp.h"
|
||||||
|
@ -32,7 +32,6 @@
|
|||||||
#include <errno.h>
|
#include <errno.h>
|
||||||
#include <openssl/err.h>
|
#include <openssl/err.h>
|
||||||
|
|
||||||
#include <sstream>
|
|
||||||
|
|
||||||
#include "util/rsdebug.h"
|
#include "util/rsdebug.h"
|
||||||
#include "util/rsnet.h"
|
#include "util/rsnet.h"
|
||||||
|
@ -41,7 +41,6 @@
|
|||||||
#include <openssl/rand.h>
|
#include <openssl/rand.h>
|
||||||
|
|
||||||
#include <iostream>
|
#include <iostream>
|
||||||
#include <sstream>
|
|
||||||
#include <iomanip>
|
#include <iomanip>
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
|
|
||||||
@ -728,9 +727,9 @@ int LoadCheckX509(const char *cert_file, std::string &issuerName, std::string &l
|
|||||||
location = getX509LocString(x509->cert_info->subject);
|
location = getX509LocString(x509->cert_info->subject);
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifdef AUTHSSL_DEBUG
|
#ifdef AUTHSSL_DEBUG
|
||||||
std::cout << getX509Info(x509) << std::endl ;
|
std::cout << getX509Info(x509) << std::endl ;
|
||||||
#endif
|
#endif
|
||||||
// clean up.
|
// clean up.
|
||||||
X509_free(x509);
|
X509_free(x509);
|
||||||
|
|
||||||
@ -857,21 +856,20 @@ std::string getX509CountryString(X509_NAME *name)
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
#ifdef AUTHSSL_DEBUG
|
||||||
std::string getX509Info(X509 *cert)
|
std::string getX509Info(X509 *cert)
|
||||||
{
|
{
|
||||||
std::stringstream out;
|
std::string out = "X509 Certificate:\n";
|
||||||
long l;
|
|
||||||
|
|
||||||
out << "X509 Certificate:" << std::endl;
|
long l;
|
||||||
l=X509_get_version(cert);
|
l=X509_get_version(cert);
|
||||||
out << " Version: " << l+1 << "(0x" << l << ")" << std::endl;
|
rs_sprintf_append(out, " Version: %ld(0x%ld)\n", l+1, l);
|
||||||
out << " Subject: " << std::endl;
|
out += " Subject: \n";
|
||||||
out << " " << getX509NameString(cert->cert_info->subject);
|
out += " " + getX509NameString(cert->cert_info->subject) + "\n\n";
|
||||||
out << std::endl;
|
out += " Signatures:\n";
|
||||||
out << std::endl;
|
return out;
|
||||||
out << " Signatures:" << std::endl;
|
|
||||||
return out.str();
|
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
/********** SSL ERROR STUFF ******************************************/
|
/********** SSL ERROR STUFF ******************************************/
|
||||||
|
|
||||||
|
@ -25,7 +25,6 @@
|
|||||||
|
|
||||||
#include "rsserver/p3discovery.h"
|
#include "rsserver/p3discovery.h"
|
||||||
#include <iostream>
|
#include <iostream>
|
||||||
#include <sstream>
|
|
||||||
|
|
||||||
RsDisc *rsDisc = NULL;
|
RsDisc *rsDisc = NULL;
|
||||||
|
|
||||||
|
@ -28,7 +28,6 @@
|
|||||||
#include "rsserver/p3face.h"
|
#include "rsserver/p3face.h"
|
||||||
|
|
||||||
#include <iostream>
|
#include <iostream>
|
||||||
#include <sstream>
|
|
||||||
#include "pqi/authssl.h"
|
#include "pqi/authssl.h"
|
||||||
#include "pqi/authgpg.h"
|
#include "pqi/authgpg.h"
|
||||||
#include "retroshare/rsinit.h"
|
#include "retroshare/rsinit.h"
|
||||||
|
@ -29,7 +29,6 @@
|
|||||||
#include "util/rsdir.h"
|
#include "util/rsdir.h"
|
||||||
|
|
||||||
#include <iostream>
|
#include <iostream>
|
||||||
#include <sstream>
|
|
||||||
|
|
||||||
#include "util/rsdebug.h"
|
#include "util/rsdebug.h"
|
||||||
const int p3facemsgzone = 11453;
|
const int p3facemsgzone = 11453;
|
||||||
|
@ -27,7 +27,6 @@
|
|||||||
|
|
||||||
|
|
||||||
#include <iostream>
|
#include <iostream>
|
||||||
#include <sstream>
|
|
||||||
|
|
||||||
#include "util/rsdir.h"
|
#include "util/rsdir.h"
|
||||||
#include "util/rsdebug.h"
|
#include "util/rsdebug.h"
|
||||||
|
@ -1785,7 +1785,6 @@ RsTurtle *rsTurtle = NULL ;
|
|||||||
|
|
||||||
#include <list>
|
#include <list>
|
||||||
#include <string>
|
#include <string>
|
||||||
#include <sstream>
|
|
||||||
|
|
||||||
// for blocking signals
|
// for blocking signals
|
||||||
#include <signal.h>
|
#include <signal.h>
|
||||||
|
@ -31,7 +31,6 @@
|
|||||||
|
|
||||||
#include "retroshare/rstypes.h"
|
#include "retroshare/rstypes.h"
|
||||||
#include <iostream>
|
#include <iostream>
|
||||||
#include <sstream>
|
|
||||||
#include <iomanip>
|
#include <iomanip>
|
||||||
|
|
||||||
|
|
||||||
|
@ -31,7 +31,6 @@
|
|||||||
#include "rsbaseserial.h"
|
#include "rsbaseserial.h"
|
||||||
#include "util/rsprint.h"
|
#include "util/rsprint.h"
|
||||||
#include <ostream>
|
#include <ostream>
|
||||||
#include <sstream>
|
|
||||||
#include <iomanip>
|
#include <iomanip>
|
||||||
#include <iostream>
|
#include <iostream>
|
||||||
|
|
||||||
|
@ -31,7 +31,6 @@
|
|||||||
#include "rsbaseserial.h"
|
#include "rsbaseserial.h"
|
||||||
#include "util/rsprint.h"
|
#include "util/rsprint.h"
|
||||||
#include <ostream>
|
#include <ostream>
|
||||||
#include <sstream>
|
|
||||||
#include <iomanip>
|
#include <iomanip>
|
||||||
#include <iostream>
|
#include <iostream>
|
||||||
|
|
||||||
|
@ -31,7 +31,6 @@
|
|||||||
#include "rsbaseserial.h"
|
#include "rsbaseserial.h"
|
||||||
#include "util/rsprint.h"
|
#include "util/rsprint.h"
|
||||||
#include <ostream>
|
#include <ostream>
|
||||||
#include <sstream>
|
|
||||||
#include <iomanip>
|
#include <iomanip>
|
||||||
#include <iostream>
|
#include <iostream>
|
||||||
|
|
||||||
|
@ -31,7 +31,6 @@
|
|||||||
#include "rsbaseserial.h"
|
#include "rsbaseserial.h"
|
||||||
#include "util/rsprint.h"
|
#include "util/rsprint.h"
|
||||||
#include <ostream>
|
#include <ostream>
|
||||||
#include <sstream>
|
|
||||||
#include <iomanip>
|
#include <iomanip>
|
||||||
#include <iostream>
|
#include <iostream>
|
||||||
|
|
||||||
|
@ -28,7 +28,6 @@
|
|||||||
#include "rsbaseserial.h"
|
#include "rsbaseserial.h"
|
||||||
#include "util/rsprint.h"
|
#include "util/rsprint.h"
|
||||||
#include <ostream>
|
#include <ostream>
|
||||||
#include <sstream>
|
|
||||||
#include <iomanip>
|
#include <iomanip>
|
||||||
#include <iostream>
|
#include <iostream>
|
||||||
|
|
||||||
|
@ -42,8 +42,6 @@
|
|||||||
const uint32_t AUTODISC_LDI_SUBTYPE_PING = 0x01;
|
const uint32_t AUTODISC_LDI_SUBTYPE_PING = 0x01;
|
||||||
const uint32_t AUTODISC_LDI_SUBTYPE_RPLY = 0x02;
|
const uint32_t AUTODISC_LDI_SUBTYPE_RPLY = 0x02;
|
||||||
|
|
||||||
#include <sstream>
|
|
||||||
|
|
||||||
#include "util/rsdebug.h"
|
#include "util/rsdebug.h"
|
||||||
#include "util/rsprint.h"
|
#include "util/rsprint.h"
|
||||||
#include "util/rsversion.h"
|
#include "util/rsversion.h"
|
||||||
|
@ -27,7 +27,6 @@
|
|||||||
#include "services/p3gameservice.h"
|
#include "services/p3gameservice.h"
|
||||||
#include "util/rsdebug.h"
|
#include "util/rsdebug.h"
|
||||||
#include "pqi/p3linkmgr.h"
|
#include "pqi/p3linkmgr.h"
|
||||||
#include <sstream>
|
|
||||||
#include <iomanip>
|
#include <iomanip>
|
||||||
|
|
||||||
/* global variable for GUI */
|
/* global variable for GUI */
|
||||||
|
@ -50,7 +50,7 @@
|
|||||||
#include <errno.h>
|
#include <errno.h>
|
||||||
#include <cmath>
|
#include <cmath>
|
||||||
|
|
||||||
#include <sstream>
|
#include <sstream> // for std::istringstream
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
|
|
||||||
#include "util/rsdebug.h"
|
#include "util/rsdebug.h"
|
||||||
|
@ -459,7 +459,6 @@ class uPnPConfigData
|
|||||||
};
|
};
|
||||||
|
|
||||||
#include <iostream>
|
#include <iostream>
|
||||||
#include <sstream>
|
|
||||||
|
|
||||||
#include "util/rsnet.h"
|
#include "util/rsnet.h"
|
||||||
|
|
||||||
|
@ -8,7 +8,6 @@
|
|||||||
|
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
#include <string>
|
#include <string>
|
||||||
#include <sstream>
|
|
||||||
#include <iostream>
|
#include <iostream>
|
||||||
#include <set>
|
#include <set>
|
||||||
#include <vector>
|
#include <vector>
|
||||||
|
@ -570,7 +570,6 @@ bool RsDirUtil::hashFile(const std::string& filepath,
|
|||||||
|
|
||||||
|
|
||||||
#include <openssl/sha.h>
|
#include <openssl/sha.h>
|
||||||
#include <sstream>
|
|
||||||
#include <iomanip>
|
#include <iomanip>
|
||||||
|
|
||||||
/* Function to hash, and get details of a file */
|
/* Function to hash, and get details of a file */
|
||||||
|
@ -28,7 +28,6 @@
|
|||||||
#include "zeroconf/p3zcnatassist.h"
|
#include "zeroconf/p3zcnatassist.h"
|
||||||
|
|
||||||
#include <openssl/sha.h>
|
#include <openssl/sha.h>
|
||||||
#include <sstream>
|
|
||||||
#include <iostream>
|
#include <iostream>
|
||||||
|
|
||||||
//#define DEBUG_ZCNATASSIST 1
|
//#define DEBUG_ZCNATASSIST 1
|
||||||
|
Loading…
Reference in New Issue
Block a user