Chromium Code Reviews| Index: include/utils/SkRTConf.h |
| diff --git a/include/utils/SkRTConf.h b/include/utils/SkRTConf.h |
| index 4ba607011dd6f8acb900da5165f76d135b8d32c5..ad7f2c80f0f7693d372aa3bf894e2a87c13882a3 100644 |
| --- a/include/utils/SkRTConf.h |
| +++ b/include/utils/SkRTConf.h |
| @@ -84,21 +84,20 @@ public: |
| template <typename T> void set(const char *confname, |
| T value, |
| bool warnIfNotFound = true); |
| -#ifdef SK_SUPPORT_UNITTEST |
| - static void UnitTest(); |
| -#endif |
| + template <typename T> bool parse(const char *name, T* value); |
|
tfarina
2014/08/07 03:05:40
I know you won't like this ;/
mtklein
2014/08/07 12:26:14
Seems fine, but let's keep it private and instead
tfarina
2014/08/07 14:11:27
Hum, who do I do that?
|
| + |
| private: |
| template<typename T> friend class SkRTConf; |
| +#ifdef SK_SUPPORT_UNITTEST |
| + SkRTConfRegistry(); |
|
tfarina
2014/08/07 03:05:40
you will probably want me to keep the bool paramet
mtklein
2014/08/07 12:26:14
I don't think so? If this test works as written,
tfarina
2014/08/07 14:11:27
Done.
|
| +#endif |
| + |
| void registerConf(SkRTConfBase *conf); |
| - template <typename T> bool parse(const char *name, T* value); |
| SkTDArray<SkString *> fConfigFileKeys, fConfigFileValues; |
| typedef SkTDict< SkTDArray<SkRTConfBase *> * > ConfMap; |
| ConfMap fConfs; |
| -#ifdef SK_SUPPORT_UNITTEST |
| - SkRTConfRegistry(bool); |
| -#endif |
| }; |
| // our singleton registry |