Changeset 769 for trunk/src/corelib/xml

Timestamp:

Aug 2, 2010, 9:27:30 PM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.6.3 sources from branches/vendor/nokia/qt.

Location:

trunk

Files:

• . (modified) (1 prop)
• src/corelib/xml/qxmlstream.g (modified) (1 diff)
• src/corelib/xml/qxmlstream_p.h (modified) (3 diffs)

trunk/src/corelib/xml/qxmlstream.g

@@ -749 +749 @@
             return true;
         } else if (act > 0) {
-            if (++tos == stack_size)
+            if (++tos == stack_size)
                 reallocateStack();
 

trunk/src/corelib/xml/qxmlstream_p.h

@@ -55 +55 @@
 #define QXMLSTREAM_P_H
 
-#if defined(Q_OS_VXWORKS) && defined(ERROR)
+#if defined(ERROR)
 #  undef ERROR
 #endif
@@ -62 +62 @@
 {
 public:
-  enum {
+  enum {
     EOF_SYMBOL = 0,
     AMPERSAND = 5,
@@ -1243 +1243 @@
             return true;
         } else if (act > 0) {
-            if (++tos == stack_size)
+            if (++tos == stack_size)
                 reallocateStack();