diff options
| author | Noel Grandin <noel@peralex.com> | 2014-09-28 15:49:26 +0200 |
|---|---|---|
| committer | Noel Grandin <noelgrandin@gmail.com> | 2014-10-01 07:34:23 +0000 |
| commit | fc04f76336fdf8c96e35382cdeb497e2f939705c (patch) | |
| tree | 70c9bbd054a34a9bca9d22bb7afbb9c4349beff0 /sal | |
| parent | eb4811590c85895ce531674596bdd6afb3397725 (diff) | |
fdo#82577: Handle Time
Put the TOOLS Time class in the tools namespace. Avoids clash with the X11
Time typedef.
Change-Id: Iac57d5aef35e81ace1ee0d5e6d76cb278f8ad866
Reviewed-on: https://gerrit.libreoffice.org/11684
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Tested-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'sal')
| -rw-r--r-- | sal/workben/measure_oustrings.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sal/workben/measure_oustrings.cxx b/sal/workben/measure_oustrings.cxx index 8372f49d4fea..0a4eb45b09f2 100644 --- a/sal/workben/measure_oustrings.cxx +++ b/sal/workben/measure_oustrings.cxx @@ -86,7 +86,7 @@ public: std::cout << "Unavailable" << std::endl; currenttest++; #ifndef HAVE_CALLGRIND - std::cout << " Elapsed Time is: " << m_nEndTime - m_nStartTime << "ms" << std::endl; + std::cout << " Elapsed tools::Time is: " << m_nEndTime - m_nStartTime << "ms" << std::endl; #endif } }; |