Added msys2 build scripts and fixed minor error in rename.h

5cript · 5cript · commit 2b5637979024 · 2016-07-26T12:12:52.000+02:00
diff --git a/.gitignore b/.gitignore
@@ -6,4 +6,5 @@ bin/*
 obj/*
 test.txt
 SimpleJSON_build_log.html
-build/*
+build/*
+build32/*
diff --git a/build-msys2.sh b/build-msys2.sh
@@ -0,0 +1,5 @@
+rm -rf build
+mkdir build
+cd build
+cmake .. -G"MSYS Makefiles" -DCMAKE_INSTALL_PREFIX=/mingw64/x86_64-w64-mingw64
+make
diff --git a/build32-msys2.sh b/build32-msys2.sh
@@ -0,0 +1,5 @@
+rm -rf build32
+mkdir build32
+cd build32
+cmake .. -G"MSYS Makefiles" -DCMAKE_INSTALL_PREFIX=/mingw64/x86_64-w64-mingw32
+make
diff --git a/utility/rename.h b/utility/rename.h
@@ -63,7 +63,7 @@ namespace JSON
         rename <T, Name>& operator=(rename <T, OtherName> const& other)
         {
             if (this == &other)
-                return;
+                return *this;
 
             objectValue_ = other.objectValue_;
             return *this;

Original file line number	Diff line number	Diff line change
`@@ -63,7 +63,7 @@ namespace JSON`
`63`	`63`	`rename <T, Name>& operator=(rename <T, OtherName> const& other)`
`64`	`64`	`{`
`65`	`65`	`if (this == &other)`
`66`		`- return;`
	`66`	`+ return *this;`
`67`	`67`
`68`	`68`	`objectValue_ = other.objectValue_;`
`69`	`69`	`return *this;`