From bb3d204603e46280d9092c811bd142c413e487a5 Mon Sep 17 00:00:00 2001
From: wmayer <wmayer@e8eeb9e2-ec13-0410-a4a9-efa5cf37419d>
Date: Sat, 12 Nov 2011 23:15:04 +0000
Subject: [PATCH] + fix build errors with VS2010

git-svn-id: https://free-cad.svn.sourceforge.net/svnroot/free-cad/trunk@5121 e8eeb9e2-ec13-0410-a4a9-efa5cf37419d
---
 src/App/Application.cpp                    | 10 ++++++----
 src/Mod/Sketcher/App/freegcs/SubSystem.cpp |  1 +
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/App/Application.cpp b/src/App/Application.cpp
index 7374fb684..7475eebaa 100644
--- a/src/App/Application.cpp
+++ b/src/App/Application.cpp
@@ -42,7 +42,8 @@
 
 #ifdef FC_OS_WIN32
 # include <Shlobj.h>
-# ifdef _MSC_VER
+// Doesn't seem to work with VS2010
+# if (defined(_MSC_VER) && (_MSC_VER < 1800))
 # include <Shfolder.h>
 # endif
 #endif
@@ -90,8 +91,9 @@
 #include "Annotation.h"
 #include "MeasureDistance.h"
 
-// If you stumble here, run the target "BuildExtractRevision" on Windows systems or the Python script "SubWCRev.py" on Linux based systems
-// which builds src/Build/Version.h. Or create your own from src/Build/Version.h.in!
+// If you stumble here, run the target "BuildExtractRevision" on Windows systems
+// or the Python script "SubWCRev.py" on Linux based systems which builds
+// src/Build/Version.h. Or create your own from src/Build/Version.h.in!
 #include <Build/Version.h>
 
 #include <boost/tokenizer.hpp>
@@ -1279,7 +1281,7 @@ void Application::LoadParameters(void)
 }
 
 
-#if (defined(_MSC_VER) && (_MSC_VER < 1600))
+#if (defined(_MSC_VER) && (_MSC_VER != 1600))
 // fix weird error while linking boost (all versions of VC)
 namespace boost { namespace program_options { std::string arg="arg"; } }
 #if (defined (BOOST_VERSION) && (BOOST_VERSION == 104100))
diff --git a/src/Mod/Sketcher/App/freegcs/SubSystem.cpp b/src/Mod/Sketcher/App/freegcs/SubSystem.cpp
index 89d531522..e6bb83212 100644
--- a/src/Mod/Sketcher/App/freegcs/SubSystem.cpp
+++ b/src/Mod/Sketcher/App/freegcs/SubSystem.cpp
@@ -21,6 +21,7 @@
  ***************************************************************************/
 
 #include <iostream>
+#include <iterator>
 #include "SubSystem.h"
 
 namespace GCS