diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2021-11-23 10:09:26 -0500 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2021-11-23 10:09:26 -0500 |
| commit | 3b8fc6b9b1232ea8cf224805c12f16e7997f21c5 (patch) | |
| tree | 166a84f24a7a588203790762f913844f62e3d624 /indra/llcommon/stringize.h | |
| parent | a32a45163d18f9b5998e469a356f870dbdb034ad (diff) | |
| parent | a33718ee4ca4edbbc4c4034b29ec4c8d102f3a7e (diff) | |
SL-16094: Merge llstring work from SL-16207
Diffstat (limited to 'indra/llcommon/stringize.h')
| -rw-r--r-- | indra/llcommon/stringize.h | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/indra/llcommon/stringize.h b/indra/llcommon/stringize.h index bc91f188e4..8501beb16d 100644 --- a/indra/llcommon/stringize.h +++ b/indra/llcommon/stringize.h @@ -197,11 +197,9 @@ void destringize_f(std::basic_string<CHARTYPE> const & str, Functor const & f) * std::istringstream in(str); * in >> item1 >> item2 >> item3 ... ; * @endcode - * @NOTE - once we get generic lambdas, we shouldn't need DEWSTRINGIZE() any - * more since DESTRINGIZE() should do the right thing with a std::wstring. But - * until then, the lambda we pass must accept the right std::basic_istream. */ -#define DESTRINGIZE(STR, EXPRESSION) (destringize_f((STR), [&](std::istream& in){in >> EXPRESSION;})) -#define DEWSTRINGIZE(STR, EXPRESSION) (destringize_f((STR), [&](std::wistream& in){in >> EXPRESSION;})) +#define DESTRINGIZE(STR, EXPRESSION) (destringize_f((STR), [&](auto& in){in >> EXPRESSION;})) +// legacy name, just use DESTRINGIZE() going forward +#define DEWSTRINGIZE(STR, EXPRESSION) DESTRINGIZE(STR, EXPRESSION) #endif /* ! defined(LL_STRINGIZE_H) */ |