Merge lp:~zorba-coders/zorba/markos-scratch into lp:zorba
Proposed by
Markos Zaharioudakis
Status: | Merged |
---|---|
Approved by: | Markos Zaharioudakis |
Approved revision: | 10988 |
Merged at revision: | 11128 |
Proposed branch: | lp:~zorba-coders/zorba/markos-scratch |
Merge into: | lp:zorba |
Diff against target: |
370 lines (+78/-69) 9 files modified
bin/zorbacmdproperties.cpp (+10/-4) bin/zorbacmdproperties.h (+13/-4) src/compiler/rewriter/rules/fold_rules.cpp (+2/-2) src/context/static_context.cpp (+8/-5) src/context/static_context.h (+39/-49) src/unit_tests/CMakeLists.txt (+1/-2) src/unit_tests/test_hashmaps.cpp (+2/-2) src/unit_tests/unit_tests.cpp (+1/-1) src/zorbaserialization/class_serializer.h (+2/-0) |
To merge this branch: | bzr merge lp:~zorba-coders/zorba/markos-scratch |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Markos Zaharioudakis | Approve | ||
Review via email: mp+133994@code.launchpad.net |
Commit message
Added missing include in test_hashmaps.cpp; hopefully fixes compilation error on Windows
Description of the change
Added missing include in test_hashmaps.cpp; hopefully fixes compilation error on Windows
To post a comment you must log in.
Validation queue starting for merge proposal. zorbatest. lambda. nu:8080/ remotequeue/ markos- scratch- 2012-11- 12T21-23- 43.252Z/ log.html
Log at: http://