Merge topic 'clang-format-source'

d9fd2f54 Revise C++ coding style using clang-format
82df6dea Empty commit at end of history preceding clang-format style transition
6a13f43f CONTRIBUTING: Add a section on coding style
bf451d9f Add a script to run clang-format on the entire source tree
1e90d78f Configure clang-format for CMake source tree
da60adc3 Tell Git to use a distinct conflict marker size in `.rst` files

1 files changed, 20 insertions, 15 deletions

diff --git a/Source/cmCryptoHash.h b/Source/cmCryptoHash.h
index 88cd240..a0c5eab 100644
--- a/Source/cmCryptoHash.h
+++ b/Source/cmCryptoHash.h
@@ -23,35 +23,40 @@ public:
   static cmsys::auto_ptr<cmCryptoHash> New(const char* algo);
   std::string HashString(const std::string& input);
   std::string HashFile(const std::string& file);
+
 protected:
-  virtual void Initialize()=0;
-  virtual void Append(unsigned char const*, int)=0;
-  virtual std::string Finalize()=0;
+  virtual void Initialize() = 0;
+  virtual void Append(unsigned char const*, int) = 0;
+  virtual std::string Finalize() = 0;
 };
 
-class cmCryptoHashMD5: public cmCryptoHash
+class cmCryptoHashMD5 : public cmCryptoHash
 {
   struct cmsysMD5_s* MD5;
+
 public:
   cmCryptoHashMD5();
   ~cmCryptoHashMD5();
+
 protected:
   virtual void Initialize();
   virtual void Append(unsigned char const* buf, int sz);
   virtual std::string Finalize();
 };
 
-#define cmCryptoHash_SHA_CLASS_DECL(SHA) \
-  class cmCryptoHash##SHA: public cmCryptoHash \
-  { \
-    union _SHA_CTX* SHA; \
-  public: \
-    cmCryptoHash##SHA(); \
-    ~cmCryptoHash##SHA(); \
-  protected: \
-    virtual void Initialize(); \
-    virtual void Append(unsigned char const* buf, int sz); \
-    virtual std::string Finalize(); \
+#define cmCryptoHash_SHA_CLASS_DECL(SHA)                                      \
+  class cmCryptoHash##SHA : public cmCryptoHash                               \
+  {                                                                           \
+    union _SHA_CTX* SHA;                                                      \
+                                                                              \
+  public:                                                                     \
+    cmCryptoHash##SHA();                                                      \
+    ~cmCryptoHash##SHA();                                                     \
+                                                                              \
+  protected:                                                                  \
+    virtual void Initialize();                                                \
+    virtual void Append(unsigned char const* buf, int sz);                    \
+    virtual std::string Finalize();                                           \
   }
 
 cmCryptoHash_SHA_CLASS_DECL(SHA1);