Kaydet (Commit) 94782ede authored tarafından Tamás Zolnai's avatar Tamás Zolnai

Fix build with DEBUG_PIVOT_TABLE macro

Change-Id: Ia2e38469ab8df268c6e03d77cae76e16e454ad76
üst 96454829
...@@ -1281,7 +1281,7 @@ void ScDPCache::Dump() const ...@@ -1281,7 +1281,7 @@ void ScDPCache::Dump() const
FieldsType::const_iterator it = maFields.begin(), itEnd = maFields.end(); FieldsType::const_iterator it = maFields.begin(), itEnd = maFields.end();
for (size_t i = 0; it != itEnd; ++it, ++i) for (size_t i = 0; it != itEnd; ++it, ++i)
{ {
const Field& fld = *it; const Field& fld = *(*it);
cout << "* source dimension: " << GetDimensionName(i) << " (ID = " << i << ")" << endl; cout << "* source dimension: " << GetDimensionName(i) << " (ID = " << i << ")" << endl;
cout << " item count: " << fld.maItems.size() << endl; cout << " item count: " << fld.maItems.size() << endl;
if (bDumpItems) if (bDumpItems)
...@@ -1306,7 +1306,7 @@ void ScDPCache::Dump() const ...@@ -1306,7 +1306,7 @@ void ScDPCache::Dump() const
GroupFieldsType::const_iterator it = maGroupFields.begin(), itEnd = maGroupFields.end(); GroupFieldsType::const_iterator it = maGroupFields.begin(), itEnd = maGroupFields.end();
for (size_t i = maFields.size(); it != itEnd; ++it, ++i) for (size_t i = maFields.size(); it != itEnd; ++it, ++i)
{ {
const GroupItems& gi = *it; const GroupItems& gi = *(*it);
cout << "* group dimension: (unnamed) (ID = " << i << ")" << endl; cout << "* group dimension: (unnamed) (ID = " << i << ")" << endl;
cout << " item count: " << gi.maItems.size() << endl; cout << " item count: " << gi.maItems.size() << endl;
cout << " group type: " << getGroupTypeName(gi.mnGroupType) << endl; cout << " group type: " << getGroupTypeName(gi.mnGroupType) << endl;
......
...@@ -3778,12 +3778,12 @@ bool ScDPCollection::HasTable( const ScRange& rRange ) const ...@@ -3778,12 +3778,12 @@ bool ScDPCollection::HasTable( const ScRange& rRange ) const
namespace { namespace {
struct DumpTable : std::unary_function<ScDPObject, void> struct DumpTable : std::unary_function<std::unique_ptr<ScDPObject>, void>
{ {
void operator() (const ScDPObject& rObj) const void operator() (const std::unique_ptr<ScDPObject>& rObj) const
{ {
cout << "-- '" << rObj.GetName() << "'" << endl; cout << "-- '" << rObj->GetName() << "'" << endl;
ScDPSaveData* pSaveData = rObj.GetSaveData(); ScDPSaveData* pSaveData = rObj->GetSaveData();
if (!pSaveData) if (!pSaveData)
return; return;
......
...@@ -182,7 +182,7 @@ ScPivotFuncData::ScPivotFuncData( SCCOL nCol, PivotFunc nFuncMask ) : ...@@ -182,7 +182,7 @@ ScPivotFuncData::ScPivotFuncData( SCCOL nCol, PivotFunc nFuncMask ) :
void ScPivotFuncData::Dump() const void ScPivotFuncData::Dump() const
{ {
cout << "ScPivotFuncData: (col=" << mnCol << ", original dim=" << mnOriginalDim cout << "ScPivotFuncData: (col=" << mnCol << ", original dim=" << mnOriginalDim
<< ", func mask=" << mnFuncMask << ", duplicate count=" << static_cast<int>(mnDupCount) << ", func mask=" << static_cast<int>(mnFuncMask) << ", duplicate count=" << static_cast<int>(mnDupCount)
<< ")" << endl; << ")" << endl;
} }
#endif #endif
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment