From 7423551dd677b510161b98f2d6990944d9c7f7f7 Mon Sep 17 00:00:00 2001 From: David Steele Date: Fri, 8 Apr 2016 12:12:26 +0100 Subject: [PATCH] Temporary types for PropertyValue debugging Note, adds global variables under DEBUG build only. Change-Id: Id40e68cb565fe03d3c0304acae9c2375c1e603b3 --- dali/integration-api/debug.cpp | 9 +++++++++ dali/integration-api/debug.h | 22 ++++++++++++++++++++++ 2 files changed, 31 insertions(+) diff --git a/dali/integration-api/debug.cpp b/dali/integration-api/debug.cpp index dc6a90c..2624818 100644 --- a/dali/integration-api/debug.cpp +++ b/dali/integration-api/debug.cpp @@ -39,6 +39,15 @@ namespace Dali { +#ifdef DEBUG_ENABLED + +// Fake globals for gdb typedefs +Dali::DebugPropertyValueArray gValueArray; +Dali::DebugPropertyValueMap gValueMap; + +#endif + + namespace // unnamed namespace { diff --git a/dali/integration-api/debug.h b/dali/integration-api/debug.h index b22a5fe..6ba890d 100644 --- a/dali/integration-api/debug.h +++ b/dali/integration-api/debug.h @@ -23,6 +23,8 @@ #include #include #include +#include +#include // INTERNAL INCLUDES #include @@ -41,6 +43,26 @@ class Matrix3; class Matrix; class Quaternion; +#if defined(DEBUG_ENABLED) + +// Less opaque types for debugger +typedef std::vector DebugPropertyValueArray; +typedef std::pair< Property::Index, Property::Value > DebugIndexValuePair; +typedef std::vector DebugStringValueContainer; +typedef std::vector< DebugIndexValuePair > DebugIndexValueContainer; + +struct DebugPropertyValueMap +{ + DebugStringValueContainer stringValues; + DebugIndexValueContainer intValues; +}; + +// Fake globals for gdb typedefs +extern Dali::DebugPropertyValueArray gValueArray; +extern Dali::DebugPropertyValueMap gValueMap; + +#endif + namespace Integration { namespace Log -- 2.7.4