Merge latest changes from release-1.0.1

Removing all C++11 features touches many parts of many files, so better merge the changes into develop ASAP to prevent future conflicts.
This commit is contained in:
Jason Watkins
2015-05-05 08:22:11 -07:00
12 changed files with 523 additions and 394 deletions

View File

@@ -73,7 +73,7 @@
#define RECVPORT 49009 // Port that the plugin receives commands on
#define OPS_PER_CYCLE 20 // Max Number of operations per cycle
XPC::UDPSocket* sock = nullptr;
XPC::UDPSocket* sock = NULL;
double start,lap;
static double timeConvert = 0.0;
@@ -126,7 +126,7 @@ PLUGIN_API void XPluginDisable(void)
{
// Close sockets
delete sock;
sock = nullptr;
sock = NULL;
// Stop rendering messages to screen.
XPC::Drawing::ClearMessage();