« back to all changes in this revision
Viewing changes to src/store/naive/ordpath.cpp
- Committer: Cezar Andrei
- Date: 2012-03-28 15:42:12 UTC
- mfrom: (10606.1.129 zorba)
- Revision ID: cezar.lp@cezarandrei.com-20120328154212-jh2heq49xcqjppce
Merge from trunck and resolve ChangeLog conflict.
- files added:
- bin/debugger/xqdb_client.cpp
- schemas/xhtml
- src/runtime/json
- src/runtime/json/pregenerated
- src/runtime/spec/json
- src/runtime/spec/uris
- src/runtime/uris
- src/runtime/uris/pregenerated
- swig/php/tests
- swig/ruby/tests
- test/rbkt/ExpQueryResults/zorba/base64
- test/rbkt/ExpQueryResults/zorba/concat_operator
- test/rbkt/ExpQueryResults/zorba/ext_var/w3c
- test/rbkt/ExpQueryResults/zorba/json
- test/rbkt/ExpQueryResults/zorba/uris
- test/rbkt/Queries/zorba/base64
- test/rbkt/Queries/zorba/concat_operator
- test/rbkt/Queries/zorba/ext_var/w3c
- test/rbkt/Queries/zorba/ext_var/w3c/SchemaImport
- test/rbkt/Queries/zorba/json
- test/rbkt/Queries/zorba/uris
- files removed:
- scripts/gen_all_props
- src/compiler/semantic_annotations
- files renamed:
- src/store/naive/collection_set.cpp => src/store/naive/simple_collection_set.cpp
- test/unit/stemmer.cpp => src/unit_tests/stemmer.cpp
- test/unit/string_test.cpp => src/unit_tests/string.cpp
- test/unit/string_instantiate.cpp => src/unit_tests/string_instantiate.cpp
- test/unit/thesaurus.cpp => src/unit_tests/thesaurus.cpp
- test/unit/tokenizer.cpp => src/unit_tests/tokenizer.cpp
- test/unit/unique_ptr.cpp => src/unit_tests/unique_ptr.cpp
- test/rbkt/ExpQueryResults/zorba/parsing_and_serializing/parse-xml-fragment-18.xml.res => test/rbkt/ExpQueryResults/zorba/parsing_and_serializing/parse-xml-fragment-16.xml.res
- files modified:
- CMakeLists.txt
- src/api/annotationimpl.cpp *
- src/runtime/parsing_and_serializing/pregenerated/parse_fragment.cpp *
- test/rbkt/ExpQueryResults/zorba/parsing_and_serializing/parse-xml-fragment-01.xml.res *
- test/rbkt/ExpQueryResults/zorba/parsing_and_serializing/parse-xml-fragment-03.xml.res *
- test/rbkt/ExpQueryResults/zorba/parsing_and_serializing/parse-xml-fragment-04.xml.res *
- test/rbkt/ExpQueryResults/zorba/parsing_and_serializing/parse-xml-fragment-05.xml.res *
- test/rbkt/ExpQueryResults/zorba/parsing_and_serializing/parse-xml-fragment-07.xml.res *
- test/rbkt/ExpQueryResults/zorba/parsing_and_serializing/parse-xml-fragment-10.xml.res *
- test/rbkt/ExpQueryResults/zorba/parsing_and_serializing/parse-xml-fragment-11.xml.res *
- test/rbkt/ExpQueryResults/zorba/parsing_and_serializing/parse-xml-fragment-14.xml.res *
- test/rbkt/ExpQueryResults/zorba/parsing_and_serializing/parse-xml-fragment-15.xml.res *
- test/rbkt/Queries/zorba/parsing_and_serializing/parse-xml-fragment-02.spec *
- test/rbkt/Queries/zorba/parsing_and_serializing/parse-xml-fragment-06.spec *
- test/rbkt/Queries/zorba/parsing_and_serializing/parse-xml-fragment-08.spec *
- test/rbkt/Queries/zorba/parsing_and_serializing/parse-xml-fragment-09.spec *
- test/rbkt/Queries/zorba/parsing_and_serializing/weather.xsd *
added
removed
src/store/naive/ordpath.cpp
