stv0g/spectrum2
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Fixed config.cpp compilation issues

Browse source
This commit is contained in:
Jan Kaluza 2012-04-10 10:13:22 +02:00
parent b3cdfe5619
commit ad2735a276
1 changed files with 11 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/config.cpp
View file

@ -27,10 +27,16 @@
#define PATH_MAX MAX_PATH
#endif
#include "iostream"
#include "boost/version.hpp"
#define BOOST_MAJOR_VERSION BOOST_VERSION / 100000
#define BOOST_MINOR_VERSION BOOST_VERSION / 100 % 1000
using namespace boost::program_options;
namespace Transport {
int getRandomPort(const std::string &s) {
static int getRandomPort(const std::string &s) {
unsigned long r = 0;
BOOST_FOREACH(char c, s) {
r += (int) c;
@ -199,7 +205,11 @@ bool Config::load(const std::string &configfile, const std::string &jid) {
options_description opts("Transport options");
return load(configfile, opts, jid);
} catch ( const boost::program_options::multiple_occurrences& e ) {
#if (BOOST_MAJOR_VERSION >= 1 && BOOST_MINOR_VERSION >= 42)
std::cerr << configfile << " parsing error: " << e.what() << " from option: " << e.get_option_name() << std::endl;
#else
std::cerr << configfile << " parsing error: " << e.what() << std::endl;
#endif
return false;
}
}