zorba-coders team mailing list archive
-
zorba-coders team
-
Mailing list archive
-
Message #23032
[Merge] lp:~zorba-coders/zorba/bug-1189996 into lp:zorba
Paul J. Lucas has proposed merging lp:~zorba-coders/zorba/bug-1189996 into lp:zorba.
Commit message:
Relocated some headers to zorba/include/util.
Requested reviews:
Paul J. Lucas (paul-lucas)
Related bugs:
Bug #1189996 in Zorba: "Relocate some public API headers to util"
https://bugs.launchpad.net/zorba/+bug/1189996
For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/bug-1189996/+merge/168850
Relocated some headers to zorba/include/util.
--
https://code.launchpad.net/~zorba-coders/zorba/bug-1189996/+merge/168850
Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'ChangeLog'
--- ChangeLog 2013-06-11 23:35:24 +0000
+++ ChangeLog 2013-06-12 05:24:33 +0000
@@ -32,6 +32,7 @@
for user-defined types.
* jn:members function takes item()* as aparameter (instead of item())
* jn:keys function takes item()* as aparameter (instead of item())
+ * Fixed bug #1189996 (Relocate some public API headers to util)
* Object/array navigation allows item()* as the type of the input sequence
(doing implicit iteration over the input sequence and skipping items
that are not objects/arrays).
=== modified file 'doc/cxx/examples/binary.cpp'
--- doc/cxx/examples/binary.cpp 2013-02-07 17:24:36 +0000
+++ doc/cxx/examples/binary.cpp 2013-06-12 05:24:33 +0000
@@ -13,18 +13,18 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
#include <zorba/zorba.h>
-#include <zorba/base64.h>
+#include <zorba/util/base64_util.h>
#include <iostream>
-
using namespace zorba;
bool
encode_example()
{
String lString("Hello Zorba");
- String lEncoded = zorba::encoding::Base64::encode(lString);
+ String lEncoded = zorba::base64::encode(lString);
return lEncoded == "SGVsbG8gWm9yYmE=";
}
@@ -32,7 +32,7 @@
decode_example()
{
String lEncoded("SGVsbG8gWm9yYmE=");
- String lDecoded = zorba::encoding::Base64::decode(lEncoded);
+ String lDecoded = zorba::base64::decode(lEncoded);
return lDecoded == "Hello Zorba";
}
=== modified file 'include/zorba/annotation.h'
--- include/zorba/annotation.h 2013-02-07 17:24:36 +0000
+++ include/zorba/annotation.h 2013-06-12 05:24:33 +0000
@@ -18,7 +18,7 @@
#include <zorba/config.h>
#include <zorba/api_shared_types.h>
-#include <zorba/smart_ptr.h>
+#include <zorba/util/smart_ptr.h>
namespace zorba {
=== modified file 'include/zorba/api_shared_types.h'
--- include/zorba/api_shared_types.h 2013-05-31 03:38:45 +0000
+++ include/zorba/api_shared_types.h 2013-06-12 05:24:33 +0000
@@ -17,7 +17,7 @@
#define ZORBA_SHARED_TYPES_INCL_H
#include <zorba/config.h>
-#include <zorba/smart_ptr.h>
+#include <zorba/util/smart_ptr.h>
namespace zorba {
=== modified file 'include/zorba/dynamic_context.h'
--- include/zorba/dynamic_context.h 2013-05-22 02:22:35 +0000
+++ include/zorba/dynamic_context.h 2013-06-12 05:24:33 +0000
@@ -21,12 +21,12 @@
#include <memory>
#include <zorba/config.h>
-#include <zorba/locale.h>
-#include <zorba/time.h>
#include <zorba/api_shared_types.h>
+#include <zorba/external_function_parameter.h>
#include <zorba/static_context_consts.h>
+#include <zorba/util/calendar.h>
+#include <zorba/util/locale.h>
#include <zorba/xmldatamanager.h>
-#include <zorba/external_function_parameter.h>
namespace zorba {
=== modified file 'include/zorba/function.h'
--- include/zorba/function.h 2013-04-19 22:25:21 +0000
+++ include/zorba/function.h 2013-06-12 05:24:33 +0000
@@ -21,7 +21,7 @@
#include <zorba/config.h>
#include <zorba/api_shared_types.h>
-#include <zorba/smart_ptr.h>
+#include <zorba/util/smart_ptr.h>
namespace zorba {
=== modified file 'include/zorba/query_location.h'
--- include/zorba/query_location.h 2013-02-07 17:24:36 +0000
+++ include/zorba/query_location.h 2013-06-12 05:24:33 +0000
@@ -18,8 +18,8 @@
#define QUERYLOCATION_H
#include <zorba/config.h>
-#include <zorba/smart_ptr.h>
#include <zorba/api_shared_types.h>
+#include <zorba/util/smart_ptr.h>
namespace zorba{
=== modified file 'include/zorba/static_context.h'
--- include/zorba/static_context.h 2013-03-25 23:02:19 +0000
+++ include/zorba/static_context.h 2013-06-12 05:24:33 +0000
@@ -16,17 +16,17 @@
#ifndef XQP_STATIC_CONTEXT_API_H
#define XQP_STATIC_CONTEXT_API_H
+#include <vector>
+
#include <zorba/config.h>
#include <zorba/api_shared_types.h>
#include <zorba/zorba_string.h>
#include <zorba/typeident.h>
#include <zorba/static_context_consts.h>
#include <zorba/options.h> // for compiler hints class
-#include <vector>
#include <zorba/function.h>
#include <zorba/annotation.h>
-#include <zorba/smart_ptr.h>
-#include <zorba/smart_ptr.h>
+#include <zorba/util/smart_ptr.h>
#ifndef ZORBA_NO_FULL_TEXT
#include <zorba/thesaurus.h>
#endif /* ZORBA_NO_FULL_TEXT */
=== modified file 'include/zorba/stemmer.h'
--- include/zorba/stemmer.h 2013-06-01 00:30:39 +0000
+++ include/zorba/stemmer.h 2013-06-12 05:24:33 +0000
@@ -24,7 +24,7 @@
#include <zorba/internal/cxx_util.h>
#include <zorba/internal/unique_ptr.h>
#include <zorba/internal/ztd.h>
-#include <zorba/locale.h>
+#include <zorba/util/locale.h>
#include <zorba/zorba_string.h>
namespace zorba {
=== modified file 'include/zorba/thesaurus.h'
--- include/zorba/thesaurus.h 2013-06-01 00:30:39 +0000
+++ include/zorba/thesaurus.h 2013-06-12 05:24:33 +0000
@@ -24,8 +24,8 @@
#include <zorba/internal/cxx_util.h>
#include <zorba/internal/unique_ptr.h>
#include <zorba/internal/ztd.h>
-#include <zorba/locale.h>
#include <zorba/uri_resolvers.h>
+#include <zorba/util/locale.h>
#include <zorba/zorba_string.h>
namespace zorba {
=== modified file 'include/zorba/tokenizer.h'
--- include/zorba/tokenizer.h 2013-06-01 00:30:39 +0000
+++ include/zorba/tokenizer.h 2013-06-12 05:24:33 +0000
@@ -24,7 +24,7 @@
#include <zorba/internal/cxx_util.h>
#include <zorba/internal/unique_ptr.h>
#include <zorba/internal/ztd.h>
-#include <zorba/locale.h>
+#include <zorba/util/locale.h>
namespace zorba {
=== modified file 'include/zorba/uri_resolvers.h'
--- include/zorba/uri_resolvers.h 2013-02-07 17:24:36 +0000
+++ include/zorba/uri_resolvers.h 2013-06-12 05:24:33 +0000
@@ -22,12 +22,12 @@
#include <zorba/config.h>
#include <zorba/api_shared_types.h>
+#include <zorba/internal/unique_ptr.h>
+#include <zorba/internal/ztd.h>
#include <zorba/item.h>
+#include <zorba/streams.h>
+#include <zorba/util/locale.h>
#include <zorba/zorba_string.h>
-#include <zorba/streams.h>
-#include <zorba/locale.h>
-#include <zorba/internal/unique_ptr.h>
-#include <zorba/internal/ztd.h>
/**
* @file uri_resolvers.h
=== renamed file 'include/zorba/base64_stream.h' => 'include/zorba/util/base64_stream.h'
=== renamed file 'include/zorba/base64.h' => 'include/zorba/util/base64_util.h'
--- include/zorba/base64.h 2013-02-07 17:24:36 +0000
+++ include/zorba/util/base64_util.h 2013-06-12 05:24:33 +0000
@@ -13,33 +13,37 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
#ifndef ZORBA_BASE64_API_H
#define ZORBA_BASE64_API_H
-#include <string>
+// standard
+#include <iostream>
+// zorba
#include <zorba/config.h>
#include <zorba/zorba_string.h>
namespace zorba {
-namespace encoding {
-
- struct ZORBA_DLL_PUBLIC Base64
- {
- static String
- encode(const String& aString);
-
- static String
- encode(std::istream& aStream);
-
- static String
- decode(const String& aString);
-
- static String
- decode(std::istream& aStream);
- };
-
-} // namespace encoding
+namespace base64 {
+
+///////////////////////////////////////////////////////////////////////////////
+
+ZORBA_DLL_PUBLIC
+String encode( String const &aString );
+
+ZORBA_DLL_PUBLIC
+String encode( std::istream &aStream );
+
+ZORBA_DLL_PUBLIC
+String decode( String const &aString );
+
+ZORBA_DLL_PUBLIC
+String decode( std::istream &aStream );
+
+///////////////////////////////////////////////////////////////////////////////
+
+} // namespace base64
} // namespace zorba
#endif /* ZORBA_BASE64_API_H */
=== renamed file 'include/zorba/time.h' => 'include/zorba/util/calendar.h'
--- include/zorba/time.h 2013-05-24 23:08:13 +0000
+++ include/zorba/util/calendar.h 2013-06-12 05:24:33 +0000
@@ -14,8 +14,8 @@
* limitations under the License.
*/
-#ifndef ZORBA_TIME_API_H
-#define ZORBA_TIME_API_H
+#ifndef ZORBA_CALENDAR_API_H
+#define ZORBA_CALENDAR_API_H
namespace zorba {
namespace time {
@@ -63,5 +63,5 @@
} // namespace time
} // namespace zorba
-#endif /* ZORBA_TIME_API_H */
+#endif /* ZORBA_CALENDAR_API_H */
/* vim:set et sw=2 ts=2: */
=== renamed file 'include/zorba/locale.h' => 'include/zorba/util/locale.h'
=== renamed file 'include/zorba/smart_ptr.h' => 'include/zorba/util/smart_ptr.h'
=== renamed file 'include/zorba/transcode_stream.h' => 'include/zorba/util/transcode_stream.h'
=== modified file 'modules/ExternalModules.conf'
--- modules/ExternalModules.conf 2013-06-11 23:54:50 +0000
+++ modules/ExternalModules.conf 2013-06-12 05:24:33 +0000
@@ -26,10 +26,13 @@
# "tag" is the VCS tag to check out (optional - defaults to HEAD;
# currently only works for bzr, since svn tags are just different URLS)
-archive bzr lp:zorba/archive-module zorba-2.9
-csv bzr lp:zorba/csv-module
+#archive bzr lp:zorba/archive-module
+archive bzr lp:~zorba-coders/zorba/bug-1189996-archive
+#csv bzr lp:zorba/csv-module
+csv bzr lp:~zorba-coders/zorba/bug-1189996-csv
data-cleaning bzr lp:zorba/data-cleaning-module
-data-formatting bzr lp:zorba/data-formatting-module
+#data-formatting bzr lp:zorba/data-formatting-module
+data-formatting bzr lp:~zorba-coders/zorba/bug-1189996-data-formatting
excel bzr lp:zorba/excel-module zorba-2.9
info-extraction bzr lp:zorba/info-extraction-module zorba-2.9
geo bzr lp:zorba/geo-module zorba-2.9
@@ -37,19 +40,27 @@
graphviz bzr lp:zorba/graphviz-module zorba-2.9
html bzr lp:zorba/html-module zorba-2.9
http-client bzr lp:zorba/http-client-module zorba-2.9
-image bzr lp:zorba/image-module zorba-2.9
-jdbc bzr lp:zorba/jdbc-module
+#image bzr lp:zorba/image-module zorba-2.9
+image bzr lp:~zorba-coders/zorba/bug-1189996-image
+#jdbc bzr lp:zorba/jdbc-module
+jdbc bzr lp:~zorba-coders/zorba/bug-1189996-jdbc
languages bzr lp:zorba/languages-module zorba-2.9
-oracle-nosql-db bzr lp:zorba/oracle-nosql-db-module
+#oracle-nosql-db bzr lp:zorba/oracle-nosql-db-module
+oracle-nosql-db bzr lp:~zorba-coders/zorba/bug-1189996-oracle-nosql-db
oauth bzr lp:zorba/oauth-module zorba-2.9
process bzr lp:zorba/process-module
-read-pdf bzr lp:zorba/read-pdf-module
-security bzr lp:zorba/security-module zorba-2.9
+#read-pdf bzr lp:zorba/read-pdf-module
+read-pdf bzr lp:~zorba-coders/zorba/bug-1189996-read-pdf
+#security bzr lp:zorba/security-module zorba-2.9
+security bzr lp:~zorba-coders/zorba/bug-1189996-security
system bzr lp:zorba/system-module zorba-2.9
-email bzr lp:zorba/email-module zorba-2.9
-util-jvm bzr lp:zorba/util-jvm-module
+#email bzr lp:zorba/email-module zorba-2.9
+email bzr lp:~zorba-coders/zorba/bug-1189996-email
+#util-jvm bzr lp:zorba/util-jvm-module
+util-jvm bzr lp:~zorba-coders/zorba/bug-1189996-util-jvm
schema-tools bzr lp:zorba/schema-tools-module
stack bzr lp:zorba/stack-module zorba-2.9
queue bzr lp:zorba/queue-module zorba-2.9
couchbase bzr lp:zorba/couchbase-module zorba-2.9
-sqlite bzr lp:zorba/sqlite-module zorba-2.9
+#sqlite bzr lp:zorba/sqlite-module zorba-2.9
+sqlite bzr lp:~zorba-coders/zorba/bug-1189996-sqlite
=== modified file 'modules/com/zorba-xquery/www/modules/http-client.xq.src/http_request_handler.cpp'
--- modules/com/zorba-xquery/www/modules/http-client.xq.src/http_request_handler.cpp 2013-02-07 17:24:36 +0000
+++ modules/com/zorba-xquery/www/modules/http-client.xq.src/http_request_handler.cpp 2013-06-12 05:24:33 +0000
@@ -16,14 +16,14 @@
#include <iostream>
+#include <zorba/api_shared_types.h>
+#include <zorba/serializer.h>
+#include <zorba/singleton_item_sequence.h>
+#include <zorba/util/base64_util.h>
+#include <zorba/xquery_functions.h>
+#include <zorba/xquery_functions.h>
#include <zorba/zorba.h>
-#include <zorba/singleton_item_sequence.h>
-#include <zorba/serializer.h>
-#include <zorba/api_shared_types.h>
-#include <zorba/xquery_functions.h>
#include <zorba/zorba_functions.h>
-#include <zorba/base64.h>
-#include <zorba/xquery_functions.h>
#include "http_request_handler.h"
@@ -117,7 +117,7 @@
if (lAuthMethod == "basic") {
String lAuthString = aUsername + ":" + aPassword;
String lAuth = "Authorization: Basic ";
- lAuth += encoding::Base64::encode(lAuthString);
+ lAuth += base64::encode(lAuthString);
theAuthMethod = lAuth.c_str();
theHeaderLists[0] = curl_slist_append(theHeaderLists[0], theAuthMethod.c_str());
} else if (lAuthMethod == "digest") {
=== modified file 'modules/com/zorba-xquery/www/modules/http-client.xq.src/http_response_parser.cpp'
--- modules/com/zorba-xquery/www/modules/http-client.xq.src/http_response_parser.cpp 2013-04-10 05:17:20 +0000
+++ modules/com/zorba-xquery/www/modules/http-client.xq.src/http_response_parser.cpp 2013-06-12 05:24:33 +0000
@@ -21,13 +21,13 @@
#include <stdexcept>
#include <string>
-#include <zorba/base64.h>
#include <zorba/config.h>
#include <zorba/diagnostic_list.h>
#include <zorba/error.h>
#include <zorba/item.h>
#include <zorba/item_factory.h>
-#include <zorba/transcode_stream.h>
+#include <zorba/util/base64_util.h>
+#include <zorba/util/transcode_stream.h>
#include <zorba/xmldatamanager.h>
#include <zorba/xquery_exception.h>
#include <zorba/xquery_exception.h>
@@ -328,7 +328,7 @@
// TODO: once a proper streaming implementation is in place this can be
// changed. This required a Base64 encoding stream since the item factory
// work only builds base64binary and assumes the data is already encoded.
- String lEncoded = encoding::Base64::encode(aStream);
+ String lEncoded = base64::encode(aStream);
return lFactory->createBase64Binary(lEncoded.data(), lEncoded.size());
}
=== modified file 'modules/org/expath/ns/file.xq.src/file.cpp'
--- modules/org/expath/ns/file.xq.src/file.cpp 2013-06-04 05:33:22 +0000
+++ modules/org/expath/ns/file.xq.src/file.cpp 2013-06-12 05:24:33 +0000
@@ -23,15 +23,15 @@
#include <stdexcept>
// Zorba
-#include <zorba/base64.h>
#include <zorba/diagnostic_list.h>
#include <zorba/empty_sequence.h>
#include <zorba/serializer.h>
#include <zorba/singleton_item_sequence.h>
-#include <zorba/transcode_stream.h>
#include <zorba/user_exception.h>
+#include <zorba/util/base64_util.h>
#include <zorba/util/fs_util.h>
#include <zorba/util/stream_util.h>
+#include <zorba/util/transcode_stream.h>
// local
#include "file_module.h"
=== modified file 'src/api/base64_streambuf.cpp'
--- src/api/base64_streambuf.cpp 2013-04-16 22:12:03 +0000
+++ src/api/base64_streambuf.cpp 2013-06-12 05:24:33 +0000
@@ -23,7 +23,7 @@
# include <stdio.h>
#endif
-#include <zorba/base64_stream.h>
+#include <zorba/util/base64_stream.h>
#include "util/base64_util.h"
=== modified file 'src/api/base64impl.cpp'
--- src/api/base64impl.cpp 2013-02-07 17:24:36 +0000
+++ src/api/base64impl.cpp 2013-06-12 05:24:33 +0000
@@ -16,8 +16,8 @@
#include "stdafx.h"
#include <sstream>
-#include <zorba/base64.h>
#include <zorba/diagnostic_list.h>
+#include <zorba/util/base64_util.h>
#include <zorba/config.h>
#include <zorba/zorba_string.h>
@@ -27,61 +27,58 @@
#include "util/base64_util.h"
#define CATCH_BASE64_EXCEPTION() \
- catch (const base64::exception& e) \
+ catch (base64::exception const &e) \
{ \
throw XQUERY_EXCEPTION(err::FORG0001, \
ERROR_PARAMS(ZED(FORG0001_Base64BadChar_2), e.invalid_char())); \
} \
- catch (const std::invalid_argument&) \
+ catch (std::invalid_argument const&) \
{ \
throw XQUERY_EXCEPTION(err::FORG0001, \
ERROR_PARAMS(ZED(FORG0001_Base64Multiple4))); \
}
+using namespace std;
namespace zorba {
-namespace encoding {
-
-String Base64::encode(const String& aString)
-{
- String result;
- base64::encode( aString.data(), aString.size(), &result );
- return result;
-}
-
-
-String Base64::encode(std::istream& aStream)
-{
- String result;
- base64::encode( aStream, &result );
- return result;
-}
-
-
-String Base64::decode(const String& aString)
-{
- try {
- String result;
- base64::decode(
- aString.data(), aString.size(), &result, base64::dopt_ignore_ws
- );
- return result;
- }
- CATCH_BASE64_EXCEPTION()
-}
-
-
-String Base64::decode(std::istream& aStream)
-{
- try {
- String result;
- base64::decode( aStream, &result, base64::dopt_ignore_ws );
- return result;
- }
- CATCH_BASE64_EXCEPTION()
-}
-
-
-} // namespace encoding
+namespace base64 {
+
+///////////////////////////////////////////////////////////////////////////////
+
+String encode(String const &aString ) {
+ String result;
+ encode( aString.data(), aString.size(), &result );
+ return result;
+}
+
+String encode( istream& aStream ) {
+ String result;
+ encode( aStream, &result );
+ return result;
+}
+
+
+String decode( String const &aString ) {
+ try {
+ String result;
+ decode( aString.data(), aString.size(), &result, dopt_ignore_ws );
+ return result;
+ }
+ CATCH_BASE64_EXCEPTION()
+}
+
+
+String decode( istream &aStream ) {
+ try {
+ String result;
+ decode( aStream, &result, dopt_ignore_ws );
+ return result;
+ }
+ CATCH_BASE64_EXCEPTION()
+}
+
+///////////////////////////////////////////////////////////////////////////////
+
+} // namespace base64
} // namespace zorba
/* vim:set et sw=2 ts=2: */
=== modified file 'src/api/serialization/serializer.cpp'
--- src/api/serialization/serializer.cpp 2013-06-05 00:37:35 +0000
+++ src/api/serialization/serializer.cpp 2013-06-12 05:24:33 +0000
@@ -19,7 +19,7 @@
#include <iomanip>
#include <zorba/zorba_string.h>
-#include <zorba/transcode_stream.h>
+#include <zorba/util/transcode_stream.h>
#include "diagnostics/xquery_diagnostics.h"
#include "diagnostics/assert.h"
=== modified file 'src/api/smart_ptr.cpp'
--- src/api/smart_ptr.cpp 2013-02-07 17:24:36 +0000
+++ src/api/smart_ptr.cpp 2013-06-12 05:24:33 +0000
@@ -13,9 +13,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-#include "stdafx.h"
-#include <zorba/smart_ptr.h>
-#include "stdafx.h"
+
+#include "stdafx.h"
+
+#include <zorba/util/smart_ptr.h>
namespace zorba {
=== modified file 'src/api/transcode_streambuf.cpp'
--- src/api/transcode_streambuf.cpp 2013-02-07 17:24:36 +0000
+++ src/api/transcode_streambuf.cpp 2013-06-12 05:24:33 +0000
@@ -15,7 +15,7 @@
*/
#include "stdafx.h"
-#include <zorba/transcode_stream.h>
+#include <zorba/util/transcode_stream.h>
#include "util/transcode_streambuf.h"
=== modified file 'src/compiler/expression/ftnode.cpp'
--- src/compiler/expression/ftnode.cpp 2013-06-01 00:30:39 +0000
+++ src/compiler/expression/ftnode.cpp 2013-06-12 05:24:33 +0000
@@ -22,8 +22,8 @@
#include "types/casting.h"
#include "util/ascii_util.h"
#include "util/indent.h"
+#include "util/locale.h"
#include "util/stl_util.h"
-#include "zorbautils/locale.h"
#include "expr_visitor.h"
#include "ftnode.h"
=== modified file 'src/compiler/expression/ftnode.h'
--- src/compiler/expression/ftnode.h 2013-06-01 00:30:39 +0000
+++ src/compiler/expression/ftnode.h 2013-06-12 05:24:33 +0000
@@ -17,8 +17,8 @@
#ifndef ZORBA_COMPILER_FTNODE_H
#define ZORBA_COMPILER_FTNODE_H
-#include <zorba/locale.h>
#include <zorba/internal/cxx_util.h>
+#include <zorba/util/locale.h>
#include "common/shared_types.h"
=== modified file 'src/context/dynamic_context.h'
--- src/context/dynamic_context.h 2013-05-08 08:01:05 +0000
+++ src/context/dynamic_context.h 2013-06-12 05:24:33 +0000
@@ -18,11 +18,11 @@
#define ZORBA_DYNAMIC_CONTEXT_H
#include <zorba/external_function_parameter.h>
-#include <zorba/time.h>
+#include <zorba/util/calendar.h>
+#include "util/locale.h"
#include "zorbautils/hashmap_zstring.h"
#include "zorbautils/hashmap_itemp.h"
-#include "zorbautils/locale.h"
#include "common/shared_types.h"
=== modified file 'src/context/uri_resolver.h'
--- src/context/uri_resolver.h 2013-02-07 17:24:36 +0000
+++ src/context/uri_resolver.h 2013-06-12 05:24:33 +0000
@@ -34,7 +34,7 @@
#include <util/auto_vector.h>
#include <store/api/shared_types.h>
#include <zorba/streams.h>
-#include <zorba/locale.h>
+#include <zorba/util/locale.h>
namespace zorba {
=== modified file 'src/debugger/debugger_clientimpl.cpp'
--- src/debugger/debugger_clientimpl.cpp 2013-02-07 17:24:36 +0000
+++ src/debugger/debugger_clientimpl.cpp 2013-06-12 05:24:33 +0000
@@ -14,11 +14,14 @@
* limitations under the License.
*/
#include "stdafx.h"
+
#include <iostream>
#include <sstream>
#include <cassert>
+
#include <zorba/debugger_event_handler.h>
-#include <zorba/base64.h>
+#include <zorba/util/base64_util.h>
+
#include "debugger/debugger_clientimpl.h"
#include "debugger/socket_streambuf.h"
@@ -566,7 +569,7 @@
DebuggerClientImpl::eval(std::string const &aExpr)
{
std::size_t id = ++theLastId;
- *theOutStream << "eval -i " << id << " -- " << encoding::Base64::encode(aExpr.c_str()) << '\0';
+ *theOutStream << "eval -i " << id << " -- " << base64::encode(aExpr.c_str()) << '\0';
theOutStream->flush();
return id;
}
=== modified file 'src/debugger/debugger_server.cpp'
--- src/debugger/debugger_server.cpp 2013-02-07 17:24:36 +0000
+++ src/debugger/debugger_server.cpp 2013-06-12 05:24:33 +0000
@@ -22,7 +22,7 @@
# include <signal.h>
#endif
-#include <zorba/base64.h>
+#include <zorba/util/base64_util.h>
#include <zorba/util/uri.h>
#include "api/xqueryimpl.h"
@@ -401,7 +401,7 @@
try {
String lEncodedData(aCommand.getData());
- String lDecodedData = encoding::Base64::decode(lEncodedData);
+ String lDecodedData = base64::decode(lEncodedData);
zstring lVar(lDecodedData.c_str());
std::list<std::pair<zstring, zstring> > lResults = theRuntime->eval(lVar);
@@ -734,7 +734,7 @@
buildChildProperties(aName, lResults, aStream);
} else if (lResults.size() == 1) {
String lValue(lResults.front().first.c_str());
- aStream << encoding::Base64::encode(lValue);
+ aStream << base64::encode(lValue);
}
aStream << "</property>";
@@ -761,7 +761,7 @@
<< "encoding=\"base64\" "
<< "constant=\"1\" "
<< "children=\"0\" "
- << ">" << encoding::Base64::encode(lValue)
+ << ">" << base64::encode(lValue)
<< "</property>";
}
}
=== modified file 'src/diagnostics/dict.cpp'
--- src/diagnostics/dict.cpp 2013-02-07 17:24:36 +0000
+++ src/diagnostics/dict.cpp 2013-06-12 05:24:33 +0000
@@ -20,7 +20,7 @@
#include <utility> /* for pair */
#include <cassert>
-#include "zorbautils/locale.h"
+#include "util/locale.h"
#include "dict.h"
#include "dict_impl.h"
=== modified file 'src/precompiled/stdafx.h'
--- src/precompiled/stdafx.h 2013-06-01 00:30:39 +0000
+++ src/precompiled/stdafx.h 2013-06-12 05:24:33 +0000
@@ -49,16 +49,19 @@
#include <zorba/store_manager.h>
#include <zorba/xquery.h>
#include <zorba/xquery_exception.h>
+
#include "diagnostics/assert.h"
- #include "zorbatypes/mapm/m_apm_lc.h"
- #include "zorbatypes/datetime/parse.h"
+ #include "util/cxx_util.h"
+ #include "util/locale.h"
#include "zorbatypes/chartype.h"
#include "zorbatypes/collation_manager.h"
+ #include "zorbatypes/datetime/parse.h"
#include "zorbatypes/ft_token.h"
#include "zorbatypes/m_apm.h"
+ #include "zorbatypes/mapm/m_apm_lc.h"
#include "zorbatypes/rclock.h"
#include "zorbatypes/schema_types.h"
-//
+
#include "zorbatypes/timezone.h"
#include "zorbatypes/URI.h"
#include "zorbatypes/xerces_xmlcharray.h"
@@ -72,7 +75,6 @@
#include "zorbautils/hashset.h"
#include "zorbautils/latch.h"
- #include "zorbautils/locale.h"
#include "zorbautils/lock.h"
#include "zorbautils/mutex.h"
#include "zorbautils/runnable.h"
=== modified file 'src/runtime/base64/base64_impl.cpp'
--- src/runtime/base64/base64_impl.cpp 2013-04-16 21:12:12 +0000
+++ src/runtime/base64/base64_impl.cpp 2013-06-12 05:24:33 +0000
@@ -16,7 +16,7 @@
#include "stdafx.h"
#include <sstream>
-#include <zorba/transcode_stream.h>
+#include <zorba/util/transcode_stream.h>
#include "system/globalenv.h"
=== modified file 'src/runtime/durations_dates_times/format_dateTime.cpp'
--- src/runtime/durations_dates_times/format_dateTime.cpp 2013-05-22 02:22:35 +0000
+++ src/runtime/durations_dates_times/format_dateTime.cpp 2013-06-12 05:24:33 +0000
@@ -32,13 +32,13 @@
#include "store/api/store.h"
#include "system/globalenv.h"
#include "util/ascii_util.h"
+#include "util/locale.h"
#include "util/stream_util.h"
#include "util/string_util.h"
#include "util/time_util.h"
#include "util/utf8_util.h"
#include "zorbatypes/datetime.h"
#include "zorbatypes/zstring.h"
-#include "zorbautils/locale.h"
// local
#include "format_dateTime.h"
=== modified file 'src/runtime/fetch/fetch_impl.cpp'
--- src/runtime/fetch/fetch_impl.cpp 2013-02-26 04:12:43 +0000
+++ src/runtime/fetch/fetch_impl.cpp 2013-06-12 05:24:33 +0000
@@ -15,7 +15,7 @@
*/
#include "stdafx.h"
-#include <zorba/transcode_stream.h>
+#include <zorba/util/transcode_stream.h>
#include "diagnostics/assert.h"
#include "diagnostics/xquery_diagnostics.h"
=== modified file 'src/runtime/full_text/apply.cpp'
--- src/runtime/full_text/apply.cpp 2013-06-07 22:04:25 +0000
+++ src/runtime/full_text/apply.cpp 2013-06-12 05:24:33 +0000
@@ -31,9 +31,9 @@
#include "store/api/store.h"
#include "system/globalenv.h"
#include "util/indent.h"
+#include "util/locale.h"
#include "util/stl_util.h"
#include "zorbamisc/ns_consts.h"
-#include "zorbautils/locale.h"
#ifndef NDEBUG
# include "system/properties.h"
=== modified file 'src/runtime/full_text/ft_module_impl.cpp'
--- src/runtime/full_text/ft_module_impl.cpp 2013-05-30 21:22:57 +0000
+++ src/runtime/full_text/ft_module_impl.cpp 2013-06-12 05:24:33 +0000
@@ -44,11 +44,11 @@
#include "types/casting.h"
#include "types/typeimpl.h"
#include "types/typeops.h"
+#include "util/locale.h"
#include "util/stl_util.h"
#include "util/utf8_util.h"
#include "zorbatypes/integer.h"
#include "zorbatypes/URI.h"
-#include "zorbautils/locale.h"
#include "ft_module_util.h"
#include "ft_stop_words_set.h"
=== modified file 'src/runtime/full_text/ft_stop_words_set.cpp'
--- src/runtime/full_text/ft_stop_words_set.cpp 2013-06-01 00:30:39 +0000
+++ src/runtime/full_text/ft_stop_words_set.cpp 2013-06-12 05:24:33 +0000
@@ -21,10 +21,10 @@
#include "context/static_context.h"
#include "context/uri_resolver.h"
#include "util/ascii_util.h"
+#include "util/locale.h"
#include "util/mmap_file.h"
#include "util/stl_util.h"
#include "util/uri_util.h"
-#include "zorbautils/locale.h"
#include "ft_stop_words_set.h"
=== modified file 'src/runtime/full_text/ft_stop_words_set.h'
--- src/runtime/full_text/ft_stop_words_set.h 2013-02-07 17:24:36 +0000
+++ src/runtime/full_text/ft_stop_words_set.h 2013-06-12 05:24:33 +0000
@@ -19,8 +19,8 @@
#include <set>
-#include <zorba/locale.h>
#include <zorba/internal/unique_ptr.h>
+#include <zorba/util/locale.h>
#include "compiler/expression/ftnode.h"
#include "zorbatypes/zstring.h"
=== modified file 'src/runtime/full_text/ft_thesaurus.h'
--- src/runtime/full_text/ft_thesaurus.h 2013-02-07 17:24:36 +0000
+++ src/runtime/full_text/ft_thesaurus.h 2013-06-12 05:24:33 +0000
@@ -17,8 +17,8 @@
#ifndef ZORBA_FULL_TEXT_FT_THESAURUS_H
#define ZORBA_FULL_TEXT_FT_THESAURUS_H
-#include <zorba/locale.h>
#include <zorba/internal/unique_ptr.h>
+#include <zorba/util/locale.h>
#include "zorbatypes/zstring.h"
=== modified file 'src/runtime/full_text/ft_token_matcher.h'
--- src/runtime/full_text/ft_token_matcher.h 2013-02-07 17:24:36 +0000
+++ src/runtime/full_text/ft_token_matcher.h 2013-06-12 05:24:33 +0000
@@ -17,7 +17,7 @@
#ifndef ZORBA_FULL_TEXT_FT_TOKEN_MATCHER_H
#define ZORBA_FULL_TEXT_FT_TOKEN_MATCHER_H
-#include <zorba/locale.h>
+#include <zorba/util/locale.h>
#include "compiler/expression/ftnode.h"
#include "context/static_context.h"
=== modified file 'src/runtime/full_text/ft_util.cpp'
--- src/runtime/full_text/ft_util.cpp 2013-05-08 20:14:47 +0000
+++ src/runtime/full_text/ft_util.cpp 2013-06-12 05:24:33 +0000
@@ -19,10 +19,10 @@
#include <stdexcept>
#include "diagnostics/xquery_diagnostics.h"
+#include "util/locale.h"
#include "zorbamisc/ns_consts.h"
#include "zorbatypes/integer.h"
#include "zorbatypes/numconversions.h"
-#include "zorbautils/locale.h"
#include "ft_util.h"
=== modified file 'src/runtime/full_text/ft_util.h'
--- src/runtime/full_text/ft_util.h 2013-06-01 00:30:39 +0000
+++ src/runtime/full_text/ft_util.h 2013-06-12 05:24:33 +0000
@@ -19,7 +19,7 @@
#include <zorba/internal/cxx_util.h>
#include <zorba/item.h>
-#include <zorba/locale.h>
+#include <zorba/util/locale.h>
#include "compiler/expression/ftnode.h"
#include "store/api/item.h"
=== modified file 'src/runtime/full_text/full_text_impl.cpp'
--- src/runtime/full_text/full_text_impl.cpp 2013-02-07 17:24:36 +0000
+++ src/runtime/full_text/full_text_impl.cpp 2013-06-12 05:24:33 +0000
@@ -15,7 +15,7 @@
*/
#include "stdafx.h"
-#include <zorba/locale.h>
+#include <zorba/util/locale.h>
#include "common/common.h"
#include "store/api/ft_token_iterator.h"
=== modified file 'src/runtime/full_text/icu_tokenizer.cpp'
--- src/runtime/full_text/icu_tokenizer.cpp 2013-06-01 00:30:39 +0000
+++ src/runtime/full_text/icu_tokenizer.cpp 2013-06-12 05:24:33 +0000
@@ -33,10 +33,10 @@
#include "diagnostics/xquery_exception.h"
#include "diagnostics/zorba_exception.h"
#include "util/ascii_util.h"
+#include "util/locale.h"
#include "util/stl_util.h"
#include "util/unicode_util.h"
#include "util/utf8_util.h"
-#include "zorbautils/locale.h"
#include "zorbautils/mutex.h"
#include "icu_tokenizer.h"
=== modified file 'src/runtime/full_text/icu_tokenizer.h'
--- src/runtime/full_text/icu_tokenizer.h 2013-06-01 00:30:39 +0000
+++ src/runtime/full_text/icu_tokenizer.h 2013-06-12 05:24:33 +0000
@@ -21,8 +21,8 @@
#include <zorba/internal/cxx_util.h>
#include <zorba/internal/unique_ptr.h>
-#include <zorba/locale.h>
#include <zorba/tokenizer.h>
+#include <zorba/util/locale.h>
namespace zorba {
=== modified file 'src/runtime/full_text/stemmer.cpp'
--- src/runtime/full_text/stemmer.cpp 2013-06-01 00:30:39 +0000
+++ src/runtime/full_text/stemmer.cpp 2013-06-12 05:24:33 +0000
@@ -17,7 +17,7 @@
#include <zorba/internal/cxx_util.h>
-#include "zorbautils/locale.h"
+#include "util/locale.h"
#include "zorbautils/mutex.h"
#include "stemmer.h"
=== modified file 'src/runtime/full_text/stemmer.h'
--- src/runtime/full_text/stemmer.h 2013-02-07 17:24:36 +0000
+++ src/runtime/full_text/stemmer.h 2013-06-12 05:24:33 +0000
@@ -22,7 +22,7 @@
#ifndef ZORBA_NO_FULL_TEXT
#include <zorba/internal/unique_ptr.h>
-#include <zorba/locale.h>
+#include <zorba/util/locale.h>
#include "util/stl_util.h"
#include "zorbatypes/zstring.h"
=== modified file 'src/runtime/full_text/stemmer/sb_stemmer.cpp'
--- src/runtime/full_text/stemmer/sb_stemmer.cpp 2013-06-01 00:30:39 +0000
+++ src/runtime/full_text/stemmer/sb_stemmer.cpp 2013-06-12 05:24:33 +0000
@@ -17,8 +17,8 @@
#include <zorba/internal/cxx_util.h>
+#include "util/locale.h"
#include "zorbautils/fatal.h"
-#include "zorbautils/locale.h"
#include "sb_stemmer.h"
=== modified file 'src/runtime/full_text/thesauri/iso2788.h'
--- src/runtime/full_text/thesauri/iso2788.h 2013-02-07 17:24:36 +0000
+++ src/runtime/full_text/thesauri/iso2788.h 2013-06-12 05:24:33 +0000
@@ -20,7 +20,7 @@
#include <cstdlib> /* for abs(3) */
#include <iostream>
-#include <zorba/locale.h>
+#include <zorba/util/locale.h>
namespace zorba {
=== modified file 'src/runtime/full_text/thesauri/wn_thesaurus.cpp'
--- src/runtime/full_text/thesauri/wn_thesaurus.cpp 2013-06-01 00:30:39 +0000
+++ src/runtime/full_text/thesauri/wn_thesaurus.cpp 2013-06-12 05:24:33 +0000
@@ -30,11 +30,12 @@
#include "system/globalenv.h"
#include "util/fs_util.h"
#include "util/less.h"
+#include "util/locale.h"
#if DEBUG_FT_THESAURUS
# include "util/oseparator.h"
#endif
#include "util/utf8_util.h"
-#include "zorbautils/locale.h"
+#include "system/globalenv.h"
#include "decode_base128.h"
#include "wn_db_segment.h"
=== modified file 'src/runtime/full_text/thesauri/xqftts_relationship.cpp'
--- src/runtime/full_text/thesauri/xqftts_relationship.cpp 2013-02-07 17:24:36 +0000
+++ src/runtime/full_text/thesauri/xqftts_relationship.cpp 2013-06-12 05:24:33 +0000
@@ -15,7 +15,7 @@
*/
#include "stdafx.h"
-#include <zorba/locale.h>
+#include <zorba/util/locale.h>
#include "util/utf8_util.h"
=== modified file 'src/runtime/full_text/thesaurus.h'
--- src/runtime/full_text/thesaurus.h 2013-02-07 17:24:36 +0000
+++ src/runtime/full_text/thesaurus.h 2013-06-12 05:24:33 +0000
@@ -17,8 +17,8 @@
#ifndef ZORBA_THESAURUS_H
#define ZORBA_THESAURUS_H
-#include <zorba/locale.h>
#include <zorba/internal/unique_ptr.h>
+#include <zorba/util/locale.h>
#include "context/uri_resolver.h"
#include "util/stl_util.h"
=== modified file 'src/runtime/full_text/tokenizer.cpp'
--- src/runtime/full_text/tokenizer.cpp 2013-02-07 17:24:36 +0000
+++ src/runtime/full_text/tokenizer.cpp 2013-06-12 05:24:33 +0000
@@ -25,8 +25,8 @@
#include "diagnostics/assert.h"
#include "store/api/store.h"
#include "system/globalenv.h"
+#include "util/locale.h"
#include "zorbamisc/ns_consts.h"
-#include "zorbautils/locale.h"
#include "ft_util.h"
=== modified file 'src/runtime/sequences/sequences_impl.cpp'
--- src/runtime/sequences/sequences_impl.cpp 2013-06-11 05:40:04 +0000
+++ src/runtime/sequences/sequences_impl.cpp 2013-06-12 05:24:33 +0000
@@ -31,7 +31,7 @@
// For timing
#include <zorba/util/time.h>
-#include <zorba/transcode_stream.h>
+#include <zorba/util/transcode_stream.h>
#include <util/fs_util.h>
#include <util/uri_util.h>
=== modified file 'src/runtime/uris/uris_impl.cpp'
--- src/runtime/uris/uris_impl.cpp 2013-06-05 00:37:35 +0000
+++ src/runtime/uris/uris_impl.cpp 2013-06-12 05:24:33 +0000
@@ -17,6 +17,8 @@
#include <algorithm>
+#include <zorba/util/transcode_stream.h>
+
#include "common/common.h"
#include "diagnostics/assert.h"
@@ -28,8 +30,6 @@
#include "system/globalenv.h"
#include "store/api/item_factory.h"
-#include "zorba/transcode_stream.h"
-
#include "util/uri_util.h"
#include "zorbatypes/URI.h"
=== modified file 'src/store/api/item.h'
--- src/store/api/item.h 2013-06-05 00:37:35 +0000
+++ src/store/api/item.h 2013-06-12 05:24:33 +0000
@@ -32,8 +32,8 @@
#include "diagnostics/xquery_diagnostics.h"
#ifndef ZORBA_NO_FULL_TEXT
-#include <zorba/locale.h>
#include <zorba/tokenizer.h>
+#include <zorba/util/locale.h>
#include "store/api/ft_token_iterator.h"
#endif /* ZORBA_NO_FULL_TEXT */
=== modified file 'src/store/naive/node_items.cpp'
--- src/store/naive/node_items.cpp 2013-04-23 10:58:29 +0000
+++ src/store/naive/node_items.cpp 2013-06-12 05:24:33 +0000
@@ -22,17 +22,17 @@
#include <zorba/item.h>
#include "api/unmarshaller.h"
-
#include "diagnostics/assert.h"
#include "diagnostics/util_macros.h"
#include "diagnostics/xquery_diagnostics.h"
-
+#ifndef ZORBA_NO_FULL_TEXT
+#include "util/locale.h"
+#endif /* ZORBA_NO_FULL_TEXT */
+#include "util/mem_sizeof.h"
+#include "util/stl_util.h"
+#include "util/string_util.h"
+#include "zorbamisc/ns_consts.h"
#include "zorbatypes/URI.h"
-#ifndef ZORBA_NO_FULL_TEXT
-#include "zorbautils/locale.h"
-#endif /* ZORBA_NO_FULL_TEXT */
-
-#include "zorbamisc/ns_consts.h"
#include "store/api/copymode.h"
#include "atomic_items.h"
@@ -48,10 +48,6 @@
#include "dataguide.h"
#include "node_factory.h"
-#include "util/mem_sizeof.h"
-#include "util/stl_util.h"
-#include "util/string_util.h"
-
#ifndef ZORBA_NO_FULL_TEXT
using namespace zorba::locale;
#endif /* ZORBA_NO_FULL_TEXT */
=== modified file 'src/store/naive/node_items.h'
--- src/store/naive/node_items.h 2013-05-21 21:44:25 +0000
+++ src/store/naive/node_items.h 2013-06-12 05:24:33 +0000
@@ -22,16 +22,16 @@
#include <store/api/item.h>
-#include <diagnostics/assert.h>
#include <zorba/config.h>
#include <zorba/error.h>
#ifndef ZORBA_NO_FULL_TEXT
-#include <zorba/locale.h>
#include <zorba/tokenizer.h>
+#include <zorba/util/locale.h>
#endif /* ZORBA_NO_FULL_TEXT */
-#include <zorbatypes/zstring.h>
-#include <zorbautils/fatal.h>
-#include <zorbautils/hashfun.h>
+#include "diagnostics/assert.h"
+#include "zorbatypes/zstring.h"
+#include "zorbautils/fatal.h"
+#include "zorbautils/hashfun.h"
#ifndef ZORBA_NO_FULL_TEXT
#include "ft_token_store.h"
=== modified file 'src/unit_tests/test_base64_streambuf.cpp'
--- src/unit_tests/test_base64_streambuf.cpp 2013-04-16 22:12:03 +0000
+++ src/unit_tests/test_base64_streambuf.cpp 2013-06-12 05:24:33 +0000
@@ -19,7 +19,7 @@
#include <iostream>
#include <sstream>
-#include <zorba/base64_stream.h>
+#include <zorba/util/base64_stream.h>
using namespace std;
using namespace zorba;
=== modified file 'src/unit_tests/test_time_parse.cpp'
--- src/unit_tests/test_time_parse.cpp 2013-03-12 03:46:25 +0000
+++ src/unit_tests/test_time_parse.cpp 2013-06-12 05:24:33 +0000
@@ -23,10 +23,10 @@
#include <string>
#include "util/ascii_util.h"
+#include "util/locale.h"
#include "util/stl_util.h"
#include "util/time_parse.h"
#include "zorbatypes/zstring.h"
-#include "zorbautils/locale.h"
using namespace std;
using namespace zorba;
=== modified file 'src/util/CMakeLists.txt'
--- src/util/CMakeLists.txt 2013-05-31 03:38:45 +0000
+++ src/util/CMakeLists.txt 2013-06-12 05:24:33 +0000
@@ -22,6 +22,7 @@
indent.cpp
json_parser.cpp
json_util.cpp
+ locale.cpp
mem_streambuf.cpp
stream_util.cpp
string_util.cpp
=== renamed file 'src/zorbautils/locale.cpp' => 'src/util/locale.cpp'
=== renamed file 'src/zorbautils/locale.h' => 'src/util/locale.h'
--- src/zorbautils/locale.h 2013-05-08 01:05:04 +0000
+++ src/util/locale.h 2013-06-12 05:24:33 +0000
@@ -19,7 +19,7 @@
#include <iostream>
-#include <zorba/locale.h>
+#include <zorba/util/locale.h>
#include "util/string_util.h"
#include "zorbatypes/zstring.h"
=== modified file 'src/util/time_parse.cpp'
--- src/util/time_parse.cpp 2013-06-01 00:30:39 +0000
+++ src/util/time_parse.cpp 2013-06-12 05:24:33 +0000
@@ -24,8 +24,8 @@
#include <zorba/internal/cxx_util.h>
#include "ascii_util.h"
#include "string_util.h"
+#include "util/locale.h"
#include "zorbatypes/zstring.h"
-#include "zorbautils/locale.h"
// local
#include "time_parse.h"
=== modified file 'src/util/time_parse.h'
--- src/util/time_parse.h 2013-06-01 00:30:39 +0000
+++ src/util/time_parse.h 2013-06-12 05:24:33 +0000
@@ -25,7 +25,7 @@
#include <zorba/internal/cxx_util.h>
#include "string_util.h"
#include "time_util.h"
-#include "zorbautils/locale.h"
+#include "util/locale.h"
namespace zorba {
namespace time {
=== modified file 'src/util/time_util.h'
--- src/util/time_util.h 2013-06-01 00:30:39 +0000
+++ src/util/time_util.h 2013-06-12 05:24:33 +0000
@@ -26,7 +26,7 @@
// Zorba
#include <zorba/config.h>
#include <zorba/internal/cxx_util.h>
-#include <zorba/time.h>
+#include <zorba/util/calendar.h>
#include "string_util.h"
#ifndef TM_YEAR_BASE
=== modified file 'src/util/transcode_streambuf.h'
--- src/util/transcode_streambuf.h 2013-02-07 17:24:36 +0000
+++ src/util/transcode_streambuf.h 2013-06-12 05:24:33 +0000
@@ -18,7 +18,7 @@
#define ZORBA_TRANSCODE_STREAMBUF_H
#include <zorba/config.h>
-#include <zorba/transcode_stream.h>
+#include <zorba/util/transcode_stream.h>
///////////////////////////////////////////////////////////////////////////////
=== modified file 'src/zorbatypes/ft_token.cpp'
--- src/zorbatypes/ft_token.cpp 2013-06-01 00:30:39 +0000
+++ src/zorbatypes/ft_token.cpp 2013-06-12 05:24:33 +0000
@@ -22,10 +22,10 @@
#include "diagnostics/assert.h"
#include "runtime/full_text/ft_wildcard.h"
#include "runtime/full_text/stemmer.h"
+#include "util/locale.h"
#include "util/stl_util.h"
#include "util/unicode_util.h"
#include "util/utf8_util.h"
-#include "zorbautils/locale.h"
#include "ft_token.h"
=== modified file 'src/zorbatypes/ft_token.h'
--- src/zorbatypes/ft_token.h 2013-06-01 00:30:39 +0000
+++ src/zorbatypes/ft_token.h 2013-06-12 05:24:33 +0000
@@ -21,7 +21,7 @@
#include <vector>
#include <zorba/internal/cxx_util.h>
-#include <zorba/locale.h>
+#include <zorba/util/locale.h>
#include "zorbatypes/zstring.h"
=== modified file 'src/zorbautils/CMakeLists.txt'
--- src/zorbautils/CMakeLists.txt 2013-02-07 17:24:36 +0000
+++ src/zorbautils/CMakeLists.txt 2013-06-12 05:24:33 +0000
@@ -20,7 +20,6 @@
mutex.cpp
condition.cpp
latch.cpp
- locale.cpp
lock.cpp
runnable.cpp
synchronous_logger.cpp
Follow ups
-
[Merge] lp:~zorba-coders/zorba/bug-1189996 into lp:zorba
From: noreply, 2013-06-13
-
[Merge] lp:~zorba-coders/zorba/bug-1189996 into lp:zorba
From: Zorba Build Bot, 2013-06-13
-
[Merge] lp:~zorba-coders/zorba/bug-1189996 into lp:zorba
From: Zorba Build Bot, 2013-06-13
-
[Merge] lp:~zorba-coders/zorba/bug-1189996 into lp:zorba
From: Chris Hillery, 2013-06-13
-
[Merge] lp:~zorba-coders/zorba/bug-1189996 into lp:zorba
From: Chris Hillery, 2013-06-13
-
[Merge] lp:~zorba-coders/zorba/bug-1189996 into lp:zorba
From: noreply, 2013-06-13
-
[Merge] lp:~zorba-coders/zorba/bug-1189996 into lp:zorba
From: Zorba Build Bot, 2013-06-13
-
[Merge] lp:~zorba-coders/zorba/bug-1189996 into lp:zorba
From: Zorba Build Bot, 2013-06-13
-
[Merge] lp:~zorba-coders/zorba/bug-1189996 into lp:zorba
From: Chris Hillery, 2013-06-13
-
Re: [Merge] lp:~zorba-coders/zorba/bug-1189996 into lp:zorba
From: Chris Hillery, 2013-06-13
-
[Merge] lp:~zorba-coders/zorba/bug-1189996 into lp:zorba
From: Zorba Build Bot, 2013-06-13
-
Re: [Merge] lp:~zorba-coders/zorba/bug-1189996 into lp:zorba
From: Zorba Build Bot, 2013-06-13
-
[Merge] lp:~zorba-coders/zorba/bug-1189996 into lp:zorba
From: Zorba Build Bot, 2013-06-13
-
[Merge] lp:~zorba-coders/zorba/bug-1189996 into lp:zorba
From: Zorba Build Bot, 2013-06-13
-
[Merge] lp:~zorba-coders/zorba/bug-1189996 into lp:zorba
From: Paul J. Lucas, 2013-06-13
-
[Merge] lp:~zorba-coders/zorba/bug-1189996 into lp:zorba
From: Zorba Build Bot, 2013-06-12
-
Re: [Merge] lp:~zorba-coders/zorba/bug-1189996 into lp:zorba
From: Zorba Build Bot, 2013-06-12
-
[Merge] lp:~zorba-coders/zorba/bug-1189996 into lp:zorba
From: Zorba Build Bot, 2013-06-12
-
[Merge] lp:~zorba-coders/zorba/bug-1189996 into lp:zorba
From: Paul J. Lucas, 2013-06-12
-
[Merge] lp:~zorba-coders/zorba/bug-1189996 into lp:zorba
From: Zorba Build Bot, 2013-06-12
-
Re: [Merge] lp:~zorba-coders/zorba/bug-1189996 into lp:zorba
From: Zorba Build Bot, 2013-06-12
-
[Merge] lp:~zorba-coders/zorba/bug-1189996 into lp:zorba
From: Zorba Build Bot, 2013-06-12
-
[Merge] lp:~zorba-coders/zorba/bug-1189996 into lp:zorba
From: Paul J. Lucas, 2013-06-12
-
[Merge] lp:~zorba-coders/zorba/bug-1189996 into lp:zorba
From: Zorba Build Bot, 2013-06-12
-
[Merge] lp:~zorba-coders/zorba/bug-1189996 into lp:zorba
From: Zorba Build Bot, 2013-06-12
-
Re: [Merge] lp:~zorba-coders/zorba/bug-1189996 into lp:zorba
From: Zorba Build Bot, 2013-06-12
-
[Merge] lp:~zorba-coders/zorba/bug-1189996 into lp:zorba
From: Paul J. Lucas, 2013-06-12
-
[Merge] lp:~zorba-coders/zorba/bug-1189996 into lp:zorba
From: Zorba Build Bot, 2013-06-12
-
Re: [Merge] lp:~zorba-coders/zorba/bug-1189996 into lp:zorba
From: Zorba Build Bot, 2013-06-12
-
[Merge] lp:~zorba-coders/zorba/bug-1189996 into lp:zorba
From: Zorba Build Bot, 2013-06-12
-
[Merge] lp:~zorba-coders/zorba/bug-1189996 into lp:zorba
From: Paul J. Lucas, 2013-06-12
-
[Merge] lp:~zorba-coders/zorba/bug-1189996 into lp:zorba
From: Zorba Build Bot, 2013-06-12
-
[Merge] lp:~zorba-coders/zorba/bug-1189996 into lp:zorba
From: Paul J. Lucas, 2013-06-12
-
[Merge] lp:~zorba-coders/zorba/bug-1189996 into lp:zorba
From: Zorba Build Bot, 2013-06-12
-
Re: [Merge] lp:~zorba-coders/zorba/bug-1189996 into lp:zorba
From: Zorba Build Bot, 2013-06-12
-
Re: [Merge] lp:~zorba-coders/zorba/bug-1189996 into lp:zorba
From: Zorba Build Bot, 2013-06-12
-
[Merge] lp:~zorba-coders/zorba/bug-1189996 into lp:zorba
From: Zorba Build Bot, 2013-06-12
-
[Merge] lp:~zorba-coders/zorba/bug-1189996 into lp:zorba
From: Zorba Build Bot, 2013-06-12
-
[Merge] lp:~zorba-coders/zorba/bug-1189996 into lp:zorba
From: Paul J. Lucas, 2013-06-12
-
[Merge] lp:~zorba-coders/zorba/bug-1189996 into lp:zorba
From: Zorba Build Bot, 2013-06-12
-
Re: [Merge] lp:~zorba-coders/zorba/bug-1189996 into lp:zorba
From: Zorba Build Bot, 2013-06-12
-
[Merge] lp:~zorba-coders/zorba/bug-1189996 into lp:zorba
From: Zorba Build Bot, 2013-06-12
-
[Merge] lp:~zorba-coders/zorba/bug-1189996 into lp:zorba
From: Paul J. Lucas, 2013-06-12
-
Re: [Merge] lp:~zorba-coders/zorba/bug-1189996 into lp:zorba
From: Paul J. Lucas, 2013-06-12