summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemko Tronçon <git@el-tramo.be>2011-03-12 16:22:03 (GMT)
committerRemko Tronçon <git@el-tramo.be>2011-03-12 16:22:03 (GMT)
commit410d721ec495e29e15d45cbd921a9bb59133973d (patch)
tree9d1dfd3f5d85ecdf41ba1296b518b65c269edc2a /Swiften/Base/Paths.cpp
parentb5d0be6e0d5b57effc5b7883d6e6e72aa2a1f062 (diff)
downloadswift-contrib-410d721ec495e29e15d45cbd921a9bb59133973d.zip
swift-contrib-410d721ec495e29e15d45cbd921a9bb59133973d.tar.bz2
Make ByteArray an std::vector<unsigned char>.
Diffstat (limited to 'Swiften/Base/Paths.cpp')
-rw-r--r--Swiften/Base/Paths.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/Swiften/Base/Paths.cpp b/Swiften/Base/Paths.cpp
index 0e69b61..43eee57 100644
--- a/Swiften/Base/Paths.cpp
+++ b/Swiften/Base/Paths.cpp
@@ -24,13 +24,13 @@ boost::filesystem::path Paths::getExecutablePath() {
ByteArray path;
uint32_t size = 4096;
path.resize(size);
- if (_NSGetExecutablePath(path.getData(), &size) == 0) {
+ if (_NSGetExecutablePath(reinterpret_cast<char*>(path.getData()), &size) == 0) {
return boost::filesystem::path(path.toString().c_str()).parent_path();
}
#elif defined(SWIFTEN_PLATFORM_LINUX)
ByteArray path;
path.resize(4096);
- size_t size = readlink("/proc/self/exe", path.getData(), path.getSize());
+ size_t size = readlink("/proc/self/exe", reinterpret_cast<char*>(path.getData()), path.getSize());
if (size > 0) {
path.resize(size);
return boost::filesystem::path(path.toString().c_str()).parent_path();
@@ -38,7 +38,7 @@ boost::filesystem::path Paths::getExecutablePath() {
#elif defined(SWIFTEN_PLATFORM_WINDOWS)
ByteArray data;
data.resize(2048);
- GetModuleFileName(NULL, data.getData(), data.getSize());
+ GetModuleFileName(NULL, reinterpret_cast<char*>(data.getData()), data.getSize());
return boost::filesystem::path(data.toString().c_str()).parent_path();
#endif
return boost::filesystem::path();