Sorin Marian Nasoi has proposed merging lp:~zorba-coders/zorba/bug-1056704 into 
lp:zorba.

Commit message:
Moved uuid.h to public API.

Requested reviews:
  Juan Zacarias (juan457)
  Sorin Marian Nasoi (sorin.marian.nasoi)
Related bugs:
  Bug #1056704 in Zorba: "XQXQ generate UUID bug"
  https://bugs.launchpad.net/zorba/+bug/1056704

For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/bug-1056704/+merge/127545

Moved uuid.h to public API.
-- 
https://code.launchpad.net/~zorba-coders/zorba/bug-1056704/+merge/127545
Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'ChangeLog'
--- ChangeLog	2012-10-02 14:58:17 +0000
+++ ChangeLog	2012-10-02 17:14:40 +0000
@@ -12,12 +12,11 @@
   * xml:parse (fragment parsing) now allows for a DOCTYPE declaration at the
     beginning of the XML document (requested in bug #1016606).
   * Roundtripping of JSON items has been moved from the serializer to encoding functions.
+  * Added uuid to public API.
   * Best-effort serialization of atomic values in JSON items.
   * Positional pagination support for index probes 
   * Recognize the {http://www.zorba-xquery.com/extensions}no-copy pragma to avoid
     copying nodes before insertion into a collection.
-  * Recognize the no-copy pragma to avoid copying nodes before insertion into
-    a collection.
   * Added createUntypedAtomic to API's ItemFactory.
   * new xqDoc feature; reporting collections and indexes
   * new xqDoc function parameter to enable/disable xqDoc generation of certain

=== renamed file 'src/util/uuid.h' => 'include/zorba/util/uuid.h'
--- src/util/uuid.h	2012-09-11 22:55:05 +0000
+++ include/zorba/util/uuid.h	2012-10-02 17:14:40 +0000
@@ -21,7 +21,7 @@
 #include <algorithm>
 #include <iostream>
 
-#include "zorbamisc/config/stdint.h"
+#include <zorba/config.h>
 
 namespace zorba {
 
@@ -43,8 +43,8 @@
  * guarantee that the \c struct fields will be laid out in memory as shown in
  * section "4.1.2. Layout and Byte Order" due to possible padding.
  */
-struct uuid {
-  typedef uint8_t value_type;
+struct ZORBA_DLL_PUBLIC uuid {
+  typedef unsigned char value_type;
   typedef value_type& reference;
   typedef value_type const& const_reference;
   typedef value_type* pointer;
@@ -242,6 +242,7 @@
  * @param u The UUID to emit.
  * @return Returns \a os.
  */
+ZORBA_DLL_PUBLIC
 std::ostream& operator<<( std::ostream &os, uuid const &u );
 
 ///////////////////////////////////////////////////////////////////////////////

=== modified file 'src/api/CMakeLists.txt'
--- src/api/CMakeLists.txt	2012-09-17 00:36:37 +0000
+++ src/api/CMakeLists.txt	2012-10-02 17:14:40 +0000
@@ -59,6 +59,7 @@
     auditimpl.cpp
     streambuf.cpp
     transcode_streambuf.cpp
+    uuid.cpp
     )
 
 IF (NOT ZORBA_NO_FULL_TEXT)

=== renamed file 'src/util/uuid.cpp' => 'src/api/uuid.cpp'
--- src/util/uuid.cpp	2012-09-17 23:32:33 +0000
+++ src/api/uuid.cpp	2012-10-02 17:14:40 +0000
@@ -16,6 +16,7 @@
 
 #include "stdafx.h"
 #include <zorba/config.h>
+#include <zorba/util/uuid.h>
 
 #include <cstdio>                       /* for sprintf(3) */
 
@@ -30,8 +31,6 @@
 # error "Unsupported operating system for generating UUIDs"
 #endif
 
-#include "uuid.h"
-
 using namespace std;
 
 namespace zorba {

=== modified file 'src/runtime/random/random_impl.cpp'
--- src/runtime/random/random_impl.cpp	2012-09-17 00:36:37 +0000
+++ src/runtime/random/random_impl.cpp	2012-10-02 17:14:40 +0000
@@ -29,7 +29,7 @@
 #include <zorba/util/time.h>
 #include <limits>
 
-#include "util/uuid.h"
+#include <zorba/util/uuid.h>
 
 namespace zorba {
 

=== modified file 'src/store/naive/simple_store.cpp'
--- src/store/naive/simple_store.cpp	2012-09-18 16:29:31 +0000
+++ src/store/naive/simple_store.cpp	2012-10-02 17:14:40 +0000
@@ -32,7 +32,7 @@
 #include "diagnostics/diagnostic.h"
 #include <zorba/diagnostic_list.h>
 
-#include "util/uuid.h"
+#include <zorba/util/uuid.h>
 #include "zorbautils/string_util.h"
 
 #ifdef ZORBA_WITH_JSON

=== modified file 'src/unit_tests/test_uuid.cpp'
--- src/unit_tests/test_uuid.cpp	2012-09-06 23:55:13 +0000
+++ src/unit_tests/test_uuid.cpp	2012-10-02 17:14:40 +0000
@@ -17,15 +17,13 @@
 #include "stdafx.h"
 #include <iostream>
 
-#include "util/uuid.h"
+#include <zorba/util/uuid.h>
 
 using namespace std;
 using namespace zorba;
 
 ///////////////////////////////////////////////////////////////////////////////
 
-///////////////////////////////////////////////////////////////////////////////
-
 namespace zorba {
 namespace UnitTests {
 

=== modified file 'src/util/CMakeLists.txt'
--- src/util/CMakeLists.txt	2012-09-17 00:36:37 +0000
+++ src/util/CMakeLists.txt	2012-10-02 17:14:40 +0000
@@ -29,7 +29,6 @@
   unicode_categories.cpp
   uri_util.cpp
   utf8_util.cpp
-  uuid.cpp
   xml_util.cpp
   fx/fxcharheap.cpp
   string/empty_rep_base.cpp

-- 
Mailing list: https://launchpad.net/~zorba-coders
Post to     : zorba-coders@lists.launchpad.net
Unsubscribe : https://launchpad.net/~zorba-coders
More help   : https://help.launchpad.net/ListHelp

Reply via email to