Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion include/lwpp/customobject_handler.h
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,8 @@ namespace lwpp
try
{
T *plugin = (T *) instance;
plugin->Evaluate(CustomObjAccess(lw_coa));
auto ca = CustomObjAccess(lw_coa);
plugin->Evaluate(ca);
}
catch (std::exception &e)
{
Expand Down
8 changes: 4 additions & 4 deletions include/lwpp/debug.h
Original file line number Diff line number Diff line change
Expand Up @@ -95,8 +95,8 @@ namespace lwpp
protected:
int sync()
{
::OutputDebugStringA(str().c_str());
str(std::basic_string<CharT>()); // Clear the string buffer
::OutputDebugStringA(basic_debugbuf::str().c_str());
basic_debugbuf::str(std::basic_string<CharT>()); // Clear the string buffer
return 0;
}
};
Expand All @@ -109,11 +109,11 @@ namespace lwpp
basic_dostream()
: std::basic_ostream<CharT, TraitsT>(new basic_debugbuf<CharT, TraitsT>())
{
setf(std::ios::unitbuf);
basic_dostream::setf(std::ios::unitbuf);
}
~basic_dostream()
{
delete rdbuf();
delete basic_dostream::rdbuf();
}
};

Expand Down
2 changes: 1 addition & 1 deletion include/lwpp/instances.h
Original file line number Diff line number Diff line change
Expand Up @@ -109,4 +109,4 @@ namespace lwpp {
}
}

#endif LWPP_INSTANCES_H
#endif // LWPP_INSTANCES_H
2 changes: 1 addition & 1 deletion include/lwpp/modeler.h
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ namespace lwpp
#define MSEL_MODE_VOLUME 2
#define MSEL_MODE_EDGE 3

class ModelerState : protected GlobalBase<LWStateQueryFuncs>
class ModelerState : public GlobalBase<LWStateQueryFuncs>
{
public:

Expand Down
4 changes: 2 additions & 2 deletions src/global.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -112,8 +112,8 @@ namespace lwpp
void LightWave::Init()
{
//systemID = (unsigned int)(unsigned long) (SuperGlobal (LWPP_SYSTEMID_GLOBAL, GFUSE_TRANSIENT));
systemID = (unsigned int) (unsigned long) (SuperGlobal (LWSYSTEMID_GLOBAL, GFUSE_ACQUIRE));
productInfo = ( unsigned int ) (unsigned long) SuperGlobal( LWPRODUCTINFO_GLOBAL, GFUSE_TRANSIENT );
systemID = (unsigned int) (uintptr_t) (SuperGlobal (LWSYSTEMID_GLOBAL, GFUSE_ACQUIRE));
productInfo = ( unsigned int ) (uintptr_t) SuperGlobal( LWPRODUCTINFO_GLOBAL, GFUSE_TRANSIENT );
}

int LightWave::GetNumCores()
Expand Down
2 changes: 1 addition & 1 deletion src/platform_cocoa.mm
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "platform_cocoa.h"
#include "lwpp/platform_cocoa.h"
#include "lwdialog.h"
#include <Cocoa/Cocoa.h>

Expand Down
2 changes: 1 addition & 1 deletion src/platform_win32.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ namespace lwpp

std::string getTempPath()
{
DWORD result = ::GetTempPath(0, "");
DWORD result = ::GetTempPath(0, const_cast<LPSTR>("") );
if(result == 0)
{
throw std::runtime_error("Could not get system temp path");
Expand Down
4 changes: 3 additions & 1 deletion src/strptime.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ static int date_get_num(const char **pp,
return val;
}

#ifndef __APPLE__
/* small strptime for ffmpeg */
const char *strptime(const char *p, const char *fmt, struct tm *dt)
{
Expand Down Expand Up @@ -95,4 +96,5 @@ const char *strptime(const char *p, const char *fmt, struct tm *dt)
}
}
return p;
}
}
#endif