commit e9b547a9ee620de0d76e5ee9bbaf01d075b69392
author Lee Thomason <leethomason@gmail.com> Wed Sep 14 10:31:10 2016 -0700
committer GitHub <noreply@github.com> Wed Sep 14 10:31:10 2016 -0700
tree 6d2c5a35c643870bb9bff00a40d54f229d7629d6
parent 584af570860b8d7aa0a8105fb79ef9e8492b8aaa
parent fed511276f1460fdea199ba386fce5b19e47627b

Merge pull request #475 from Dmitry-Me/splitAccessAndAdjustment

Split access and pointer adjustment

tinyxml2.cpp

diff --git a/tinyxml2.cpp b/tinyxml2.cpp
index 9a8904f..9d74681 100755
--- a/tinyxml2.cpp
+++ b/tinyxml2.cpp
@@ -281,7 +281,8 @@
                     else {

                         ++p;

                     }

-                    *q++ = LF;

+                    *q = LF;

+                    ++q;

                 }

                 else if ( (_flags & NEEDS_NEWLINE_NORMALIZATION) && *p == LF ) {

                     if ( *(p+1) == CR ) {

@@ -290,7 +291,8 @@
                     else {

                         ++p;

                     }

-                    *q++ = LF;

+                    *q = LF;

+                    ++q;

                 }

                 else if ( (_flags & NEEDS_ENTITY_PROCESSING) && *p == '&' ) {

                     // Entities handled by tinyXML2:

tinyxml2.h

diff --git a/tinyxml2.h b/tinyxml2.h
index 4379f01..0b5e3cc 100755
--- a/tinyxml2.h
+++ b/tinyxml2.h
@@ -211,7 +211,8 @@
     void Push( T t ) {

         TIXMLASSERT( _size < INT_MAX );

         EnsureCapacity( _size+1 );

-        _mem[_size++] = t;

+        _mem[_size] = t;

+        ++_size;

     }

 

     T* PushArr( int count ) {

@@ -225,7 +226,8 @@
 

     T Pop() {

         TIXMLASSERT( _size > 0 );

-        return _mem[--_size];

+        --_size;

+        return _mem[_size];

     }

 

     void PopArr( int count ) {