summaryrefslogtreecommitdiff
path: root/server/src
diff options
context:
space:
mode:
authordeva <deva>2007-08-30 07:34:10 +0000
committerdeva <deva>2007-08-30 07:34:10 +0000
commit27bc1afc3aa6e0b4465946aa870573499b85ae5d (patch)
tree41c5fb2f98eb1b3a7038409c0ded04b9b3d9dedc /server/src
parentd20446df32e9aa63d853e4cb2aa691b72f4c8fa6 (diff)
Fixed libconfig upgrade incompatabilities (upgraded to v1.1.2)
Diffstat (limited to 'server/src')
-rw-r--r--server/src/pracrod.cc9
1 files changed, 5 insertions, 4 deletions
diff --git a/server/src/pracrod.cc b/server/src/pracrod.cc
index c9fa58b..7fce884 100644
--- a/server/src/pracrod.cc
+++ b/server/src/pracrod.cc
@@ -152,6 +152,9 @@ int main(int argc, char *argv[])
}
}
+ //std::basic_string<_CharT, _Traits, _Alloc>::basic_string(const _CharT*, const _Alloc&) [with _CharT = char, _Traits = std::char_traits<char>, _Alloc = std::allocator<char>]
+ //std::basic_string<_CharT, _Traits, _Alloc>::basic_string(const std::basic_string<_CharT, _Traits, _Alloc>&) [with _CharT = char, _Traits = std::char_traits<char>, _Alloc = std::allocator<char>]
+
char *cfname = NULL;
if(!configfile) cfname = ETC"/pracrod.conf";
else cfname = configfile;
@@ -161,8 +164,7 @@ int main(int argc, char *argv[])
if(!user) {
std::string userstr;
try {
- userstr = (std::string)Pentominos::config()->lookup("user");
- user = strdup(userstr.c_str());
+ user = (char*)(const char*)Pentominos::config()->lookup("user");
} catch( ... ) {
printf("User not found in config.\n");
}
@@ -190,8 +192,7 @@ int main(int argc, char *argv[])
if(!group) {
std::string groupstr;
try {
- groupstr = (std::string)Pentominos::config()->lookup("group");
- group = strdup(groupstr.c_str());
+ group = (char*)(const char*)Pentominos::config()->lookup("group");
} catch( ... ) {
printf("Group not found in config.\n");
}