diff options
author | Loren Shih <seraph@lindenlab.com> | 2010-03-25 20:15:51 -0400 |
---|---|---|
committer | Loren Shih <seraph@lindenlab.com> | 2010-03-25 20:15:51 -0400 |
commit | 0a56031bd3e3645a9e5124a722cece0706469944 (patch) | |
tree | 39e2244564d2b71d8277231f691160807f8c10b9 /indra/llcommon/llsys.h | |
parent | 885fc3f9b54cca33e134bcfb65c1d2a9c0aeec7a (diff) | |
parent | fad31dc087cb670bd4479195cac2c31da9a55e57 (diff) |
automated merge
Diffstat (limited to 'indra/llcommon/llsys.h')
-rw-r--r-- | indra/llcommon/llsys.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/llcommon/llsys.h b/indra/llcommon/llsys.h index f1dda1b2e2..c2c45bec9a 100644 --- a/indra/llcommon/llsys.h +++ b/indra/llcommon/llsys.h @@ -122,6 +122,7 @@ public: U32 getPhysicalMemoryClamped() const; ///< Memory size in clamped bytes }; + LL_COMMON_API std::ostream& operator<<(std::ostream& s, const LLOSInfo& info); LL_COMMON_API std::ostream& operator<<(std::ostream& s, const LLCPUInfo& info); LL_COMMON_API std::ostream& operator<<(std::ostream& s, const LLMemoryInfo& info); |