mingzailao
/
mitsuba
mirror of https://github.com/Quartenia/mitsuba.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

renamed some old function prefixes

metadata
Wenzel Jakob 2011-08-16 20:37:47 -04:00
parent bc00cfabde
commit 8019a53716
4 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
include/mitsuba/core/platform.h
View File

@ -140,15 +140,15 @@
MTS_NAMESPACE_BEGIN
#if defined(__OSX__)
extern void __ubi_autorelease_init();
extern void __ubi_autorelease_shutdown();
extern void __ubi_autorelease_begin();
extern void __ubi_autorelease_end();
extern std::string __ubi_bundlepath();
extern void __ubi_chdir_to_bundlepath();
extern void __ubi_init_cocoa();
#define MTS_AUTORELEASE_BEGIN() __ubi_autorelease_begin();
#define MTS_AUTORELEASE_END() __ubi_autorelease_end();
extern void __mts_autorelease_init();
extern void __mts_autorelease_shutdown();
extern void __mts_autorelease_begin();
extern void __mts_autorelease_end();
extern std::string __mts_bundlepath();
extern void __mts_chdir_to_bundlepath();
extern void __mts_init_cocoa();
#define MTS_AUTORELEASE_BEGIN() __mts_autorelease_begin();
#define MTS_AUTORELEASE_END() __mts_autorelease_end();
#define MTS_AMBIGUOUS_SIZE_T 1
#else
#define MTS_AUTORELEASE_BEGIN()

2
src/libcore/fresolver.cpp
View File

@ -20,7 +20,7 @@ FileResolver::FileResolver() {
}
#elif defined(__OSX__)
MTS_AUTORELEASE_BEGIN()
addPath(__ubi_bundlepath());
addPath(__mts_bundlepath());
MTS_AUTORELEASE_END()
#elif defined(WIN32)
char lpFilename[1024];

4
src/libcore/thread.cpp
View File

@ -260,7 +260,7 @@ std::string Thread::toString() const {
void Thread::staticInitialization() {
#if defined(__OSX__)
__ubi_autorelease_init();
__mts_autorelease_init();
#endif
m_self = new ThreadLocal<Thread>();
@ -298,7 +298,7 @@ void Thread::staticShutdown() {
m_idMutex = NULL;
#endif
#if defined(__OSX__)
__ubi_autorelease_shutdown();
__mts_autorelease_shutdown();
#endif
}

2
src/mtsgui/main.cpp
View File

@ -167,7 +167,7 @@ int main(int argc, char *argv[]) {
/* Create a log file inside the application bundle */
MTS_AUTORELEASE_BEGIN()
logger->addAppender(new StreamAppender(formatString("%s/mitsuba.%s.log",
__ubi_bundlepath().c_str(), getHostName().c_str())));
__mts_bundlepath().c_str(), getHostName().c_str())));
MTS_AUTORELEASE_END()
#else
/* Create a log file inside the current working directory */