From e12c08e8d170b7ca40f204a5b0423c23a9fbc2c1 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Wed, 17 Apr 2019 06:17:24 +0200 Subject: ClangFormat: apply to source, most of intern Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat --- .../blender/freestyle/intern/view_map/ViewMapIO.h | 50 ++++++++++------------ 1 file changed, 22 insertions(+), 28 deletions(-) (limited to 'source/blender/freestyle/intern/view_map/ViewMapIO.h') diff --git a/source/blender/freestyle/intern/view_map/ViewMapIO.h b/source/blender/freestyle/intern/view_map/ViewMapIO.h index 57eb450d45b..98d27852c8d 100644 --- a/source/blender/freestyle/intern/view_map/ViewMapIO.h +++ b/source/blender/freestyle/intern/view_map/ViewMapIO.h @@ -36,9 +36,9 @@ namespace ViewMapIO { static const unsigned ZERO = UINT_MAX; -int load(istream& in, ViewMap *vm, ProgressBar *pb = NULL); +int load(istream &in, ViewMap *vm, ProgressBar *pb = NULL); -int save(ostream& out, ViewMap *vm, ProgressBar *pb = NULL); +int save(ostream &out, ViewMap *vm, ProgressBar *pb = NULL); namespace Options { @@ -53,60 +53,54 @@ void rmFlags(const unsigned char flags); unsigned char getFlags(); -void setModelsPath(const string& path); +void setModelsPath(const string &path); string getModelsPath(); -}; // End of namepace Options +}; // namespace Options #ifdef IRIX namespace Internal { -template -ostream& write(ostream& out, const char *str) +template ostream &write(ostream &out, const char *str) { - out.put(str[S - 1]); - return write(out, str); + out.put(str[S - 1]); + return write(out, str); } -template<> -ostream& write<1>(ostream& out, const char *str) +template<> ostream &write<1>(ostream &out, const char *str) { - return out.put(str[0]); + return out.put(str[0]); } -template<> -ostream& write<0>(ostream& out, const char *) +template<> ostream &write<0>(ostream &out, const char *) { - return out; + return out; } -template -istream& read(istream& in, char *str) +template istream &read(istream &in, char *str) { - in.get(str[S - 1]); - return read(in, str); + in.get(str[S - 1]); + return read(in, str); } -template<> -istream& read<1>(istream& in, char *str) +template<> istream &read<1>(istream &in, char *str) { - return in.get(str[0]); + return in.get(str[0]); } -template<> -istream& read<0>(istream& in, char *) +template<> istream &read<0>(istream &in, char *) { - return in; + return in; } -} // End of namespace Internal +} // End of namespace Internal -#endif // IRIX +#endif // IRIX -} // End of namespace ViewMapIO +} // End of namespace ViewMapIO } /* namespace Freestyle */ -#endif // __FREESTYLE_VIEW_MAP_IO_H__ +#endif // __FREESTYLE_VIEW_MAP_IO_H__ -- cgit v1.2.3