Merge pull request OpenCPN#19 from nohal/fix_warnings

Fix several crashes and compiler warnings
did-g · Apr 25, 2015 · 9efc2d0 · 9efc2d0
2 parents 1b916d8 + 249d480
commit 9efc2d0
Show file tree

Hide file tree

Showing 12 changed files with 48 additions and 967 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,5 +1,5 @@
 ##---------------------------------------------------------------------------
-## Author:      jongough aka. Jon Gough
+# Author:      jongough aka. Jon Gough
 ## Copyright:
 ## License:     wxWidgets License
 ##---------------------------------------------------------------------------
@@ -85,7 +85,7 @@ SET(HDRS
  		include/ODvector2D.h
  		include/OCPNDrawicons.h
 		include/version.h
-        	include/wx/json_defs.h
+#        	include/wx/json_defs.h
        		include/wx/jsonreader.h
         	include/wx/jsonval.h
         	include/wx/jsonwriter.h

diff --git a/include/json_defs.h b/include/json_defs.h
diff --git a/include/jsonreader.h b/include/jsonreader.h