diff --git a/example/jgrep/jgrep.cpp b/example/jgrep/jgrep.cpp
index 4609b965..ee176ff1 100644
--- a/example/jgrep/jgrep.cpp
+++ b/example/jgrep/jgrep.cpp
@@ -41,7 +41,7 @@ using std::endl;
 #endif
 
 #include "jgrep.h"
-
+#ifndef BOOST_REGEX_NO_FILEITER
 
 //
 // class ogrep_predicate
@@ -146,12 +146,4 @@ void process_grep(const char* file)
    }
 }
 
-
-
-
-
-
-
-
-
-
+#endif
diff --git a/example/jgrep/main.cpp b/example/jgrep/main.cpp
index 9fc8b697..201eadc9 100644
--- a/example/jgrep/main.cpp
+++ b/example/jgrep/main.cpp
@@ -40,6 +40,7 @@ using std::endl;
 #include <boost/regex/v4/fileiter.hpp>
 #endif
 #include "jgrep.h"
+#ifndef BOOST_REGEX_NO_FILEITER
 
 #ifndef JM_ALGO_INCLUDED
 // HP and SGI STL's use <algo.h> instead
@@ -282,7 +283,20 @@ int main(int argc, char * argv[])
    return 0;
 }
 
-
+#else
+
+#include <iostream>
+
+int main(int argc, char * argv[])
+{
+   std::cout <<
+   "\n<note>\n"
+   "This functionality is not available on with this compiler on this platform.\n"
+   "</note>\n";
+   return 0;
+}
+
+#endif
 
 
 
diff --git a/example/snippets/regex_grep_example_3.cpp b/example/snippets/regex_grep_example_3.cpp
index 1a1e7127..22c660eb 100644
--- a/example/snippets/regex_grep_example_3.cpp
+++ b/example/snippets/regex_grep_example_3.cpp
@@ -88,7 +88,7 @@ void class_index::IndexClasses(const std::string& file)
    start = file.begin();
    end = file.end();
    base = start;
-#if BOOST_WORKAROUND(BOOST_MSVC, < 1300) && !defined(_STLP_VERSION)
+#if BOOST_WORKAROUND(_MSC_VER, < 1300) && !defined(_STLP_VERSION)
    boost::regex_grep(std::bind1st(std::mem_fun1(&class_index::grep_callback), this),
             start,
             end,
diff --git a/test/concepts/concept_check.cpp b/test/concepts/concept_check.cpp
index 4bbd05ca..1e7e5be5 100644
--- a/test/concepts/concept_check.cpp
+++ b/test/concepts/concept_check.cpp
@@ -28,7 +28,7 @@ int main()
 {
    // VC6 and VC7 can't cope with the iterator architypes, 
    // don't bother testing as it doesn't work:
-#if !BOOST_WORKAROUND(BOOST_MSVC, < 1310)
+#if !BOOST_WORKAROUND(_MSC_VER, < 1310)
    typedef boost::bidirectional_iterator_archetype<char> iterator_type;
    boost::regex r;
    iterator_type a, b;
diff --git a/test/concepts/wide_concept_check.cpp b/test/concepts/wide_concept_check.cpp
index cbb4c385..52f2031d 100644
--- a/test/concepts/wide_concept_check.cpp
+++ b/test/concepts/wide_concept_check.cpp
@@ -28,7 +28,7 @@ int main()
 #ifndef BOOST_NO_WREGEX
    // VC6 and VC7 can't cope with the iterator architypes, 
    // don't bother testing as it doesn't work:
-#if !BOOST_WORKAROUND(BOOST_MSVC, < 1310)
+#if !BOOST_WORKAROUND(_MSC_VER, < 1310)
    typedef boost::bidirectional_iterator_archetype<wchar_t> iterator_type;
    boost::wregex r;
    iterator_type a, b;