1 --- tellico-1.3.5/src/translators/pilotdb/libflatfile/DB.cpp~ 2009-11-03 16:11:57.000000000 +0200
2 +++ tellico-1.3.5/src/translators/pilotdb/libflatfile/DB.cpp 2009-11-03 16:12:07.794304369 +0200
4 kdDebug() << "list view is corrupt" << endl;
6 // Determine the length of the name string.
7 - pi_char_t* null_ptr = reinterpret_cast<pi_char_t*>
8 + const pi_char_t* null_ptr = reinterpret_cast<const pi_char_t*>
9 (memchr(chunk.data() + 4, 0, 32));
11 lv.name = std::string((char *) (chunk.data() + 4),
12 --- tellico-1.3.6/src/cite/actionmanager.cpp~ 2008-01-07 07:33:53.000000000 +0200
13 +++ tellico-1.3.6/src/cite/actionmanager.cpp 2011-01-10 21:46:34.197702109 +0200
16 using Tellico::Cite::ActionManager;
18 -ActionManager::ActionManager* ActionManager::self() {
19 +ActionManager* ActionManager::self() {
20 static ActionManager self;