[LINT] error 62

joce · joce · commit 910b0fefbf1e · 2010-11-18T21:15:12.000-07:00
Error -- Incompatible types (void/nonvoid) for operator ':'

Signed-off-by: Jocelyn Legault &lt;jocelynlegault@gmail.com&gt;
diff --git a/PythonScript/src/PythonScript.cpp b/PythonScript/src/PythonScript.cpp
@@ -19,8 +19,7 @@ using namespace boost::python;
 
 using namespace std;
 
-#define CHECK_INITIALISED()  (g_initialised ? 0 : initialisePython())
-
+#define CHECK_INITIALIZED()  if (!g_initialised) initialisePython()
 
 /* Info for Notepad++ */
 CONST TCHAR PLUGIN_NAME[]	= _T("Python Script");
@@ -372,7 +371,7 @@ extern "C" __declspec(dllexport) LRESULT messageProc(UINT message, WPARAM wParam
 					case PYSCR_EXECSCRIPT:
 					case PYSCR_EXECSTATEMENT:
 					{
-						CHECK_INITIALISED();
+						CHECK_INITIALIZED();
 						PythonScript_Exec* pse = reinterpret_cast<PythonScript_Exec*>(ci->info);
 						if (pse->structVersion != 1)
 						{
@@ -489,7 +488,7 @@ void runScript(int number)
 
 void runStatement(const char *statement, bool synchronous, HANDLE completedEvent /* = NULL */, bool allowQueuing /* = false */)
 {
-	CHECK_INITIALISED();
+	CHECK_INITIALIZED();
 	MenuManager::getInstance()->stopScriptEnabled(true);
 	if (!pythonHandler->runScript(statement, synchronous, allowQueuing, completedEvent, true))
 	{
@@ -538,7 +537,7 @@ void runScript(const char *filename, bool synchronous, HANDLE completedEvent /*
 	}
 	else
 	{
-		CHECK_INITIALISED();
+		CHECK_INITIALIZED();
 		MenuManager::getInstance()->stopScriptEnabled(true);
 		
 		// TODO: Really need to not change this if it's a MSGTOPLUGIN run
@@ -566,7 +565,7 @@ void showConsole()
 {
 	if (g_console)
 	{
-		CHECK_INITIALISED();
+		CHECK_INITIALIZED();
 		g_console->showDialog();
 	}
 }

Original file line number	Diff line number	Diff line change
`@@ -19,8 +19,7 @@ using namespace boost::python;`
`19`	`19`
`20`	`20`	`using namespace std;`
`21`	`21`
`22`		`-#define CHECK_INITIALISED() (g_initialised ? 0 : initialisePython())`
`23`		`-`
	`22`	`+#define CHECK_INITIALIZED() if (!g_initialised) initialisePython()`
`24`	`23`
`25`	`24`	`/* Info for Notepad++ */`
`26`	`25`	`CONST TCHAR PLUGIN_NAME[] = _T("Python Script");`
`@@ -372,7 +371,7 @@ extern "C" __declspec(dllexport) LRESULT messageProc(UINT message, WPARAM wParam`
`372`	`371`	`case PYSCR_EXECSCRIPT:`
`373`	`372`	`case PYSCR_EXECSTATEMENT:`
`374`	`373`	`{`
`375`		`- CHECK_INITIALISED();`
	`374`	`+ CHECK_INITIALIZED();`
`376`	`375`	`PythonScript_Exec* pse = reinterpret_cast<PythonScript_Exec*>(ci->info);`
`377`	`376`	`if (pse->structVersion != 1)`
`378`	`377`	`{`
`@@ -489,7 +488,7 @@ void runScript(int number)`
`489`	`488`
`490`	`489`	`void runStatement(const char statement, bool synchronous, HANDLE completedEvent / = NULL /, bool allowQueuing / = false */)`
`491`	`490`	`{`
`492`		`- CHECK_INITIALISED();`
	`491`	`+ CHECK_INITIALIZED();`
`493`	`492`	`MenuManager::getInstance()->stopScriptEnabled(true);`
`494`	`493`	`if (!pythonHandler->runScript(statement, synchronous, allowQueuing, completedEvent, true))`
`495`	`494`	`{`
`@@ -538,7 +537,7 @@ void runScript(const char filename, bool synchronous, HANDLE completedEvent /`
`538`	`537`	`}`
`539`	`538`	`else`
`540`	`539`	`{`
`541`		`- CHECK_INITIALISED();`
	`540`	`+ CHECK_INITIALIZED();`
`542`	`541`	`MenuManager::getInstance()->stopScriptEnabled(true);`
`543`	`542`
`544`	`543`	`// TODO: Really need to not change this if it's a MSGTOPLUGIN run`
`@@ -566,7 +565,7 @@ void showConsole()`
`566`	`565`	`{`
`567`	`566`	`if (g_console)`
`568`	`567`	`{`
`569`		`- CHECK_INITIALISED();`
	`568`	`+ CHECK_INITIALIZED();`
`570`	`569`	`g_console->showDialog();`
`571`	`570`	`}`
`572`	`571`	`}`