~zorba-coders/zorba/QT_driver_fixes

« back to all changes in this revision

Viewing changes to src/system/globalenv.cpp

Committer: sorin.marian.nasoi
Date: 2013-08-06 16:39:51 UTC
mfrom: (11547.2.36 lp_zorba)
Revision ID: spungi@gmail.com-20130806163951-ad2k2v2914sbqr3f

-merged lp:zorba trunk.

files removed:
src/zorbatypes/mapm/MULTI_THREAD/CMakeLists.txt

files modified:
bin/zorbacmd.cpp

doc/cxx/examples/context.cpp

doc/cxx/examples/datamanager.cpp

include/zorba/api_shared_types.h

include/zorba/xmldatamanager.h

include/zorba/zorba.h

modules/org/expath/ns/file.xq.src/file.cpp

src/annotations/annotations.cpp

src/api/documentmanagerimpl.h

src/api/item_seq_singleton.cpp

src/api/staticcontextimpl.cpp

src/api/staticcontextimpl.h

src/api/xmldatamanagerimpl.cpp

src/api/xmldatamanagerimpl.h

src/api/zorbaimpl.cpp

src/api/zorbaimpl.h

src/capi/cimplementation.cpp

src/capi/cimplementation.h

src/compiler/parser/jsoniq_parser.cpp

src/compiler/parser/jsoniq_parser.hpp

src/compiler/parser/jsoniq_scanner.cpp

src/compiler/parser/xquery_parser.cpp

src/compiler/parser/xquery_parser.hpp

src/compiler/parser/xquery_scanner.cpp

src/compiler/parsetree/parsenodes.h

src/compiler/translator/translator.cpp

src/context/default_uri_mappers.cpp

src/context/dynamic_context.cpp

src/context/root_static_context.cpp

src/context/static_context.cpp

src/diagnostics/dict.cpp

src/functions/function.cpp

src/functions/function.h

src/functions/pregenerated/func_datetime.h

src/runtime/base/plan_iterator.cpp

src/runtime/durations_dates_times/format_dateTime.cpp

src/runtime/full_text/ft_module_impl.cpp

src/runtime/full_text/ft_stop_words_set.cpp

src/runtime/full_text/icu_tokenizer.cpp

src/runtime/full_text/stemmer.cpp

src/runtime/numerics/format_integer.cpp

src/runtime/parsing_and_serializing/parse_fragment_impl.cpp

src/runtime/parsing_and_serializing/parsing_and_serializing_impl.cpp

src/runtime/spec/datetime/datetime.xml

src/runtime/spec/printer_visitor_cpp.xq

src/runtime/visitors/iterprinter.cpp

src/runtime/visitors/pregenerated/printer_visitor.cpp

src/store/api/item.h

src/store/naive/item.cpp

src/store/naive/store.cpp

src/system/globalenv.cpp

src/system/globalenv.h

src/types/typeimpl.h

src/unit_tests/test_stemmer.cpp

src/unit_tests/test_tokenizer.cpp

src/util/locale.cpp

src/util/string/default_rep.h

src/zorbaserialization/serialize_zorba_types.h

src/zorbatypes/CMakeLists.txt

src/zorbatypes/URI.cpp

src/zorbatypes/m_apm.cpp

src/zorbatypes/m_apm.h

src/zorbatypes/mapm/MULTI_THREAD/m_apm_mt.h

swig/XmlDataManager.h

swig/XmlDataManager.i

swig/Zorba.h

swig/Zorba.i

swig/xqj/ZorbaXQConnection.java

swig/xqj/ZorbaXQPreparedExpression.java

swig/xqj/ZorbaXQXmlDataManager.java

test/api/xmldatamanager.cpp

test/apitest.cpp

test/driver/testdriver.cpp

test/driver/testdriver_common.cpp

test/driver/testdriver_common.h

test/driver/testdriver_mt.cpp

test/driver/testuriresolver.cpp

test/driver/testuriresolver.h

test/driver/updtestdriver.cpp

test/unit/staticcollectionmanager.cpp

test/unit/xmldatamanager.cpp

Show diffs side-by-side

added added

removed removed

src/system/globalenv.cpp

#ifdef ZORBA_XQUERYX

//libxml2 and libxslt are needed

xmlInitMemory();

100

xmlInitParser();

100

101

102

LIBXML_TEST_VERSION

102

103

112

113

114

m_globalEnv->m_http_resolver = new internal::HTTPURLResolver();

114

115

m_globalEnv->m_dynamic_loader = 0;

116

m_globalEnv->theDynamicLoader = 0;

117

118

m_globalEnv->theHostCountry = locale::get_host_country();

119

120

m_globalEnv->theHostLang = locale::get_host_lang();

116

121

}

117

122

118

123

128

// note: destruction must be done in reverse initialization order

124

129

void GlobalEnvironment::destroy()

125

130

{

126

delete m_globalEnv->m_dynamic_loader;

131

delete m_globalEnv->theDynamicLoader;

127

132

128

133

delete m_globalEnv->m_http_resolver;

129

134

312

317

313

318

DynamicLoader* GlobalEnvironment::getDynamicLoader() const

314

319

{

315

if (!m_dynamic_loader)

320

if (!theDynamicLoader)

316

321

{

317

m_dynamic_loader = new DynamicLoader();

322

theDynamicLoader = new DynamicLoader();

318

323

}

319

return m_dynamic_loader;

324

return theDynamicLoader;

320

325

}

321

326

322

327

#ifdef ZORBA_XQUERYX

Older »