diff -ru boost/atomic/detail/gcc-alpha.hpp ../../workspace/sdk-phase-1/includes/boost/atomic/detail/gcc-alpha.hpp
--- boost/atomic/detail/gcc-alpha.hpp	2009-11-29 23:19:04.000000000 +0100
+++ ../../workspace/sdk-phase-1/includes/boost/atomic/detail/gcc-alpha.hpp	2009-12-01 09:38:21.000000000 +0100
@@ -1,7 +1,7 @@
 #ifndef BOOST_DETAIL_ATOMIC_GCC_ALPHA_HPP
 #define BOOST_DETAIL_ATOMIC_GCC_ALPHA_HPP
 
-#include <boost/atomic/memory_order.hpp>
+#include <boost/memory_order.hpp>
 #include <boost/atomic/detail/base.hpp>
 #include <boost/atomic/detail/builder.hpp>
 
@@ -42,7 +42,6 @@
 static inline void __fence_before(memory_order order)
 {
 	switch(order) {
-		case memory_order_consume:
 		case memory_order_release:
 		case memory_order_acq_rel:
 		case memory_order_seq_cst:
diff -ru boost/atomic/detail/gcc-ppc.hpp ../../workspace/sdk-phase-1/includes/boost/atomic/detail/gcc-ppc.hpp
--- boost/atomic/detail/gcc-ppc.hpp	2009-11-29 23:19:04.000000000 +0100
+++ ../../workspace/sdk-phase-1/includes/boost/atomic/detail/gcc-ppc.hpp	2009-12-01 09:38:27.000000000 +0100
@@ -1,7 +1,7 @@
 #ifndef BOOST_DETAIL_ATOMIC_GCC_PPC_HPP
 #define BOOST_DETAIL_ATOMIC_GCC_PPC_HPP
 
-#include <boost/atomic/memory_order.hpp>
+#include <boost/memory_order.hpp>
 #include <boost/atomic/detail/base.hpp>
 #include <boost/atomic/detail/builder.hpp>
 
diff -ru boost/atomic/detail/gcc-x86.hpp ../../workspace/sdk-phase-1/includes/boost/atomic/detail/gcc-x86.hpp
--- boost/atomic/detail/gcc-x86.hpp	2009-11-29 23:19:04.000000000 +0100
+++ ../../workspace/sdk-phase-1/includes/boost/atomic/detail/gcc-x86.hpp	2009-12-01 09:37:50.000000000 +0100
@@ -1,7 +1,7 @@
 #ifndef BOOST_DETAIL_ATOMIC_GCC_X86_HPP
 #define BOOST_DETAIL_ATOMIC_GCC_X86_HPP
 
-#include <boost/atomic/memory_order.hpp>
+#include <boost/memory_order.hpp>
 #include <boost/atomic/detail/base.hpp>
 #include <boost/atomic/detail/builder.hpp>
 
@@ -12,7 +12,6 @@
 static inline void __fence_before(memory_order order)
 {
 	switch(order) {
-		case memory_order_consume:
 		case memory_order_release:
 		case memory_order_acq_rel:
 		case memory_order_seq_cst:
@@ -24,7 +23,6 @@
 static inline void __fence_after(memory_order order)
 {
 	switch(order) {
-		case memory_order_acquire:
 		case memory_order_acq_rel:
 		case memory_order_seq_cst:
 			__asm__ __volatile__ ("" ::: "memory");
diff -ru boost/atomic/detail/generic-cas.hpp ../../workspace/sdk-phase-1/includes/boost/atomic/detail/generic-cas.hpp
--- boost/atomic/detail/generic-cas.hpp	2009-11-29 23:19:04.000000000 +0100
+++ ../../workspace/sdk-phase-1/includes/boost/atomic/detail/generic-cas.hpp	2009-12-01 09:38:37.000000000 +0100
@@ -3,7 +3,7 @@
 
 #include <stdint.h>
 
-#include <boost/atomic/memory_order.hpp>
+#include <boost/memory_order.hpp>
 #include <boost/atomic/detail/base.hpp>
 #include <boost/atomic/detail/builder.hpp>
 
Only in boost/atomic: memory_order.hpp
diff -ru boost/atomic.hpp ../../workspace/sdk-phase-1/includes/boost/atomic.hpp
--- boost/atomic.hpp	2009-11-29 23:19:04.000000000 +0100
+++ ../../workspace/sdk-phase-1/includes/boost/atomic.hpp	2009-12-01 09:39:01.000000000 +0100
@@ -1,7 +1,7 @@
 #ifndef __BOOST_ATOMIC_HPP
 #define __BOOST_ATOMIC_HPP
 
-#include <boost/atomic/memory_order.hpp>
+#include <boost/memory_order.hpp>
 #include <boost/atomic/platform.hpp>
 #include <boost/atomic/detail/valid_integral_types.hpp>
 
@@ -13,8 +13,16 @@
 	typedef detail::atomic::__platform_atomic<T> super;
 	typedef typename super::integral_type integral_type;
 	
-	atomic() {detail::atomic::valid_atomic_type<T> verify_valid_atomic_integral;}
-	atomic(T v) : super(v) {detail::atomic::valid_atomic_type<T> verify_valid_atomic_integral;}
+	atomic()
+	{
+		detail::atomic::valid_atomic_type<T> verify_valid_atomic_integral;
+		(void)verify_valid_atomic_integral;
+	}
+	atomic(T v) : super(v)
+	{
+		detail::atomic::valid_atomic_type<T> verify_valid_atomic_integral;
+		(void)verify_valid_atomic_integral;
+	}
 	
 	using super::load;
 	using super::store;
