Subversion Repository Public Repository

Divide-Framework

This repository has no backups
This repository's network speed is throttled to 100KB/sec

Diff Revisions 318 vs 321 for /trunk/Source Code/Libs/src/GLIM/glimBatchData.cpp

Diff revisions: vs.
  @@ -220,7 +220,7 @@
220 220 m_PositionData.push_back (y);
221 221 m_PositionData.push_back (z);
222 222
223 - std::map<std::string, GlimArrayData>::iterator it, itend;
223 + std::map<stringImpl, GlimArrayData>::iterator it, itend;
224 224 itend = m_Attributes.end ();
225 225
226 226 for (it = m_Attributes.begin (); it != itend; ++it)
  @@ -246,7 +246,7 @@
246 246
247 247 m_Signature.push_back (sig);
248 248
249 - std::map<std::string, GlimArrayData>::const_iterator it, itend;
249 + std::map<stringImpl, GlimArrayData>::const_iterator it, itend;
250 250 itend = m_Attributes.end ();
251 251
252 252 unsigned int uiOffset = sizeof (float) * 3;
  @@ -323,7 +323,7 @@
323 323 {
324 324 unsigned int uiVertexDataSize = sizeof (float) * 3;
325 325
326 - std::map<std::string, GlimArrayData>::const_iterator it, itend;
326 + std::map<stringImpl, GlimArrayData>::const_iterator it, itend;
327 327 itend = m_Attributes.end ();
328 328
329 329 for (it = m_Attributes.begin (); it != itend; ++it)
  @@ -386,7 +386,7 @@
386 386 Divide::GL_API::setActiveBuffer(GL_ARRAY_BUFFER, m_uiVertexBufferID);
387 387 Divide::GL_API::setActiveBuffer(GL_ELEMENT_ARRAY_BUFFER, 0);
388 388
389 - std::map<std::string, GlimArrayData>::iterator it, itend;
389 + std::map<stringImpl, GlimArrayData>::iterator it, itend;
390 390 itend = m_Attributes.end ();
391 391
392 392 for (it = m_Attributes.begin (); it != itend; ++it)
  @@ -476,7 +476,7 @@
476 476
477 477 // now upload each attribute array one after another
478 478
479 - std::map<std::string, GlimArrayData>::iterator it, itend;
479 + std::map<stringImpl, GlimArrayData>::iterator it, itend;
480 480 itend = m_Attributes.end ();
481 481
482 482 for (it = m_Attributes.begin (); it != itend; ++it)