# HG changeset patch # User Christian Wirth # Date 1412853551 -7200 # Node ID 538cbc117324e25d810bb432ab18dcd06ef7cc5b # Parent 21015ffe0a1eb8f55250eb49cd6c0f041971cfe3 Fix Windows compile error around OrderedPair in superword.hpp (C2 change!) diff -r 21015ffe0a1e -r 538cbc117324 src/share/vm/opto/superword.hpp --- a/src/share/vm/opto/superword.hpp Thu Oct 09 00:23:17 2014 +0200 +++ b/src/share/vm/opto/superword.hpp Thu Oct 09 13:19:11 2014 +0200 @@ -201,6 +201,30 @@ static const SWNodeInfo initial; }; +//------------------------------OrderedPair--------------------------- +// Ordered pair of Node*. +class OrderedPair VALUE_OBJ_CLASS_SPEC { + protected: + Node* _p1; + Node* _p2; + public: + OrderedPair() : _p1(NULL), _p2(NULL) {} + OrderedPair(Node* p1, Node* p2) { + if (p1->_idx < p2->_idx) { + _p1 = p1; _p2 = p2; + } else { + _p1 = p2; _p2 = p1; + } + } + + bool operator==(const OrderedPair &rhs) { + return _p1 == rhs._p1 && _p2 == rhs._p2; + } + void print() { tty->print(" (%d, %d)", _p1->_idx, _p2->_idx); } + + static const OrderedPair initial; +}; + // -----------------------------SuperWord--------------------------------- // Transforms scalar operations into packed (superword) operations. class SuperWord : public ResourceObj { @@ -504,29 +528,4 @@ void print(); }; - -//------------------------------OrderedPair--------------------------- -// Ordered pair of Node*. -class OrderedPair VALUE_OBJ_CLASS_SPEC { - protected: - Node* _p1; - Node* _p2; - public: - OrderedPair() : _p1(NULL), _p2(NULL) {} - OrderedPair(Node* p1, Node* p2) { - if (p1->_idx < p2->_idx) { - _p1 = p1; _p2 = p2; - } else { - _p1 = p2; _p2 = p1; - } - } - - bool operator==(const OrderedPair &rhs) { - return _p1 == rhs._p1 && _p2 == rhs._p2; - } - void print() { tty->print(" (%d, %d)", _p1->_idx, _p2->_idx); } - - static const OrderedPair initial; -}; - #endif // SHARE_VM_OPTO_SUPERWORD_HPP