[Bf-blender-cvs] [38c30c4] master: BGE: Fix ShowDeprecationWarning macro.

Thomas Szepe noreply at git.blender.org
Fri Feb 27 23:11:59 CET 2015


Commit: 38c30c41d7a2d4befa8a533911781364a3936ab4
Author: Thomas Szepe
Date:   Fri Feb 27 23:05:06 2015 +0100
Branches: master
https://developer.blender.org/rB38c30c41d7a2d4befa8a533911781364a3936ab4

BGE: Fix ShowDeprecationWarning macro.

Reviewers: lordloki, brita_, sybren, moguri

Reviewed By: moguri

Differential Revision: https://developer.blender.org/D1144

===================================================================

M	source/gameengine/Expressions/PyObjectPlus.h

===================================================================

diff --git a/source/gameengine/Expressions/PyObjectPlus.h b/source/gameengine/Expressions/PyObjectPlus.h
index e2e7c24..34b814d 100644
--- a/source/gameengine/Expressions/PyObjectPlus.h
+++ b/source/gameengine/Expressions/PyObjectPlus.h
@@ -65,21 +65,21 @@ typedef struct {
 #define ShowDeprecationWarning(old_way, new_way)                              \
 {                                                                             \
 	static WarnLink wlink = {false, NULL};                                    \
-	if ((m_ignore_deprecation_warnings || wlink.warn_done)==0)                \
+	if ((PyObjectPlus::m_ignore_deprecation_warnings || wlink.warn_done)==0)  \
 	{                                                                         \
-		ShowDeprecationWarning_func(old_way, new_way);                        \
+		PyObjectPlus::ShowDeprecationWarning_func(old_way, new_way);          \
 		                                                                      \
-		WarnLink *wlink_last= GetDeprecationWarningLinkLast();                \
+		WarnLink *wlink_last= PyObjectPlus::GetDeprecationWarningLinkLast();  \
 		wlink.warn_done = true;                                               \
 		wlink.link = NULL;                                                    \
 		                                                                      \
 		if(wlink_last) {                                                      \
 			wlink_last->link= (void *)&(wlink);                               \
-			SetDeprecationWarningLinkLast(&(wlink));                          \
+			PyObjectPlus::SetDeprecationWarningLinkLast(&(wlink));            \
 		}                                                                     \
 		else {                                                                \
-			SetDeprecationWarningFirst(&(wlink));                             \
-			SetDeprecationWarningLinkLast(&(wlink));                          \
+			PyObjectPlus::SetDeprecationWarningFirst(&(wlink));               \
+			PyObjectPlus::SetDeprecationWarningLinkLast(&(wlink));            \
 		}                                                                     \
 	}                                                                         \
 }                                                                             \




More information about the Bf-blender-cvs mailing list