diff options
Diffstat (limited to '')
-rw-r--r-- | linden/indra/llcommon/lluuid.h | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/linden/indra/llcommon/lluuid.h b/linden/indra/llcommon/lluuid.h index 4b32138..c78fb12 100644 --- a/linden/indra/llcommon/lluuid.h +++ b/linden/indra/llcommon/lluuid.h | |||
@@ -35,6 +35,7 @@ | |||
35 | #include <iostream> | 35 | #include <iostream> |
36 | #include <set> | 36 | #include <set> |
37 | #include "stdtypes.h" | 37 | #include "stdtypes.h" |
38 | #include "llpreprocessor.h" | ||
38 | 39 | ||
39 | const S32 UUID_BYTES = 16; | 40 | const S32 UUID_BYTES = 16; |
40 | const S32 UUID_WORDS = 4; | 41 | const S32 UUID_WORDS = 4; |
@@ -47,7 +48,7 @@ struct uuid_time_t { | |||
47 | U32 low; | 48 | U32 low; |
48 | }; | 49 | }; |
49 | 50 | ||
50 | class LLUUID | 51 | class LL_COMMON_API LLUUID |
51 | { | 52 | { |
52 | public: | 53 | public: |
53 | // | 54 | // |
@@ -106,8 +107,8 @@ public: | |||
106 | LLUUID combine(const LLUUID& other) const; | 107 | LLUUID combine(const LLUUID& other) const; |
107 | void combine(const LLUUID& other, LLUUID& result) const; | 108 | void combine(const LLUUID& other, LLUUID& result) const; |
108 | 109 | ||
109 | friend std::ostream& operator<<(std::ostream& s, const LLUUID &uuid); | 110 | friend LL_COMMON_API std::ostream& operator<<(std::ostream& s, const LLUUID &uuid); |
110 | friend std::istream& operator>>(std::istream& s, LLUUID &uuid); | 111 | friend LL_COMMON_API std::istream& operator>>(std::istream& s, LLUUID &uuid); |
111 | 112 | ||
112 | void toString(char *out) const; // Does not allocate memory, needs 36 characters (including \0) | 113 | void toString(char *out) const; // Does not allocate memory, needs 36 characters (including \0) |
113 | void toString(std::string& out) const; | 114 | void toString(std::string& out) const; |
@@ -323,7 +324,7 @@ typedef std::set<LLUUID, lluuid_less> uuid_list_t; | |||
323 | */ | 324 | */ |
324 | typedef LLUUID LLAssetID; | 325 | typedef LLUUID LLAssetID; |
325 | 326 | ||
326 | class LLTransactionID : public LLUUID | 327 | class LL_COMMON_API LLTransactionID : public LLUUID |
327 | { | 328 | { |
328 | public: | 329 | public: |
329 | LLTransactionID() : LLUUID() { } | 330 | LLTransactionID() : LLUUID() { } |