Merge branch 'hotfix-1.3' into develop

2016-02-17 00:34:22 +08:00
parent e195ae8469 5e09cf1aef
commit 2dd9283782
3 changed files with 16 additions and 3 deletions
--- a/source/filesystem/filesystem.cpp
+++ b/source/filesystem/filesystem.cpp
@@ -38,7 +38,9 @@


 namespace nana {	namespace experimental {
+#ifndef CXX_NO_INLINE_NAMESPACE
 	inline namespace v1 {
+#endif
 	namespace filesystem
 	{
 		//class filesystem_error
@@ -870,7 +872,10 @@ namespace nana {	namespace experimental {
 				::chdir(p.c_str());
 #endif
 			}
+
+#ifndef CXX_NO_INLINE_NAMESPACE
 		} //end namespace v1
+#endif
 		}//end namespace filesystem
 	} //end namespace experimental
 }//end namespace nana