diff --git a/include/boost/functional/hash/deque.hpp b/include/boost/functional/hash/deque.hpp
index e320561..8e92727 100644
--- a/include/boost/functional/hash/deque.hpp
+++ b/include/boost/functional/hash/deque.hpp
@@ -14,9 +14,11 @@
 # pragma once
 #endif
 
-#if defined(_MSC_VER) || defined(__BORLANDC__)
+#if defined(__EDG__)
+#elif defined(_MSC_VER) || defined(__BORLANDC__) || defined(__DMC__)
 #pragma message("Warning: boost/functional/hash/deque.hpp is deprecated, use boost/functional/hash.hpp instead.")
-#else
+#elif defined(__GNUC__) || defined(__HP_aCC) || \
+    defined(__SUNPRO_CC) || defined(__IBMCPP__)
 #warning "boost/functional/hash/deque.hpp is deprecated, use boost/functional/hash.hpp instead."
 #endif
 
diff --git a/include/boost/functional/hash/list.hpp b/include/boost/functional/hash/list.hpp
index 03e8fa4..219394b 100644
--- a/include/boost/functional/hash/list.hpp
+++ b/include/boost/functional/hash/list.hpp
@@ -14,9 +14,11 @@
 # pragma once
 #endif
 
-#if defined(_MSC_VER) || defined(__BORLANDC__)
+#if defined(__EDG__)
+#elif defined(_MSC_VER) || defined(__BORLANDC__) || defined(__DMC__)
 #pragma message("Warning: boost/functional/hash/list.hpp is deprecated, use boost/functional/hash.hpp instead.")
-#else
+#elif defined(__GNUC__) || defined(__HP_aCC) || \
+    defined(__SUNPRO_CC) || defined(__IBMCPP__)
 #warning "boost/functional/hash/list.hpp is deprecated, use boost/functional/hash.hpp instead."
 #endif
 
diff --git a/include/boost/functional/hash/map.hpp b/include/boost/functional/hash/map.hpp
index 7e5782c..59e259f 100644
--- a/include/boost/functional/hash/map.hpp
+++ b/include/boost/functional/hash/map.hpp
@@ -14,9 +14,11 @@
 # pragma once
 #endif
 
-#if defined(_MSC_VER) || defined(__BORLANDC__)
+#if defined(__EDG__)
+#elif defined(_MSC_VER) || defined(__BORLANDC__) || defined(__DMC__)
 #pragma message("Warning: boost/functional/hash/map.hpp is deprecated, use boost/functional/hash.hpp instead.")
-#else
+#elif defined(__GNUC__) || defined(__HP_aCC) || \
+    defined(__SUNPRO_CC) || defined(__IBMCPP__)
 #warning "boost/functional/hash/map.hpp is deprecated, use boost/functional/hash.hpp instead."
 #endif
 
diff --git a/include/boost/functional/hash/pair.hpp b/include/boost/functional/hash/pair.hpp
index 6ad2063..68f2233 100644
--- a/include/boost/functional/hash/pair.hpp
+++ b/include/boost/functional/hash/pair.hpp
@@ -14,9 +14,11 @@
 # pragma once
 #endif
 
-#if defined(_MSC_VER) || defined(__BORLANDC__)
+#if defined(__EDG__)
+#elif defined(_MSC_VER) || defined(__BORLANDC__) || defined(__DMC__)
 #pragma message("Warning: boost/functional/hash/pair.hpp is deprecated, use boost/functional/hash.hpp instead.")
-#else
+#elif defined(__GNUC__) || defined(__HP_aCC) || \
+    defined(__SUNPRO_CC) || defined(__IBMCPP__)
 #warning "boost/functional/hash/pair.hpp is deprecated, use boost/functional/hash.hpp instead."
 #endif
 
diff --git a/include/boost/functional/hash/set.hpp b/include/boost/functional/hash/set.hpp
index 57fe0bf..6e3ef71 100644
--- a/include/boost/functional/hash/set.hpp
+++ b/include/boost/functional/hash/set.hpp
@@ -14,9 +14,11 @@
 # pragma once
 #endif
 
-#if defined(_MSC_VER) || defined(__BORLANDC__)
+#if defined(__EDG__)
+#elif defined(_MSC_VER) || defined(__BORLANDC__) || defined(__DMC__)
 #pragma message("Warning: boost/functional/hash/set.hpp is deprecated, use boost/functional/hash.hpp instead.")
-#else
+#elif defined(__GNUC__) || defined(__HP_aCC) || \
+    defined(__SUNPRO_CC) || defined(__IBMCPP__)
 #warning "boost/functional/hash/set.hpp is deprecated, use boost/functional/hash.hpp instead."
 #endif
 
diff --git a/include/boost/functional/hash/vector.hpp b/include/boost/functional/hash/vector.hpp
index 3f662d2..eeadf4e 100644
--- a/include/boost/functional/hash/vector.hpp
+++ b/include/boost/functional/hash/vector.hpp
@@ -14,9 +14,11 @@
 # pragma once
 #endif
 
-#if defined(_MSC_VER) || defined(__BORLANDC__)
+#if defined(__EDG__)
+#elif defined(_MSC_VER) || defined(__BORLANDC__) || defined(__DMC__)
 #pragma message("Warning: boost/functional/hash/vector.hpp is deprecated, use boost/functional/hash.hpp instead.")
-#else
+#elif defined(__GNUC__) || defined(__HP_aCC) || \
+    defined(__SUNPRO_CC) || defined(__IBMCPP__)
 #warning "boost/functional/hash/vector.hpp is deprecated, use boost/functional/hash.hpp instead."
 #endif