]> git.pld-linux.org Git - packages/mythplugins.git/blame - cxx11.patch
- fix shebangs and files, rel 11
[packages/mythplugins.git] / cxx11.patch
CommitLineData
71d992b3
JR
1--- mythplugins-0.26.1/mythmusic/mythmusic/metaio.h~ 2013-08-15 16:44:02.000000000 +0200
2+++ mythplugins-0.26.1/mythmusic/mythmusic/metaio.h 2017-05-27 07:18:20.791635440 +0200
3@@ -95,7 +95,7 @@
4 {
5 (void)filename;
6 (void)type;
7- return false;
8+ return nullptr;
9 }
10
11 void readFromFilename(const QString &filename, QString &artist,
12--- mythplugins-0.26.1/mythzoneminder/mythzmserver/zmserver.cpp.orig 2013-08-15 16:44:02.000000000 +0200
13+++ mythplugins-0.26.1/mythzoneminder/mythzmserver/zmserver.cpp 2017-05-27 07:23:00.152442302 +0200
14@@ -1376,14 +1376,14 @@
15 if (mapFile >= 0)
16 {
17 if (m_debug)
18- cout << "Opened mmap file: " << mmap_filename << endl;
19+ cout << "Opened mmap file: " << mmap_filename.rdbuf() << endl;
20
21 shm_ptr = mmap(NULL, shared_data_size, PROT_READ,
22 MAP_SHARED, mapFile, 0x0);
23 if (shm_ptr == NULL)
24 {
25 cout << "Failed to map shared memory from file [" <<
26- mmap_filename << "] " <<
27+ mmap_filename.rdbuf() << "] " <<
28 "for monitor: " <<
29 monitor->mon_id <<
30 endl;
This page took 0.083031 seconds and 4 git commands to generate.