Reactor: Split Traits.hpp into Traits.hpp and Traits.inl

src/Reactor/Reactor.hpp

@@ -3761,4 +3761,6 @@ namespace rr
 	else   // ELSE_BLOCK__
 }
 
+#include "Traits.inl"
+
 #endif   // rr_Reactor_hpp

src/Reactor/Reactor.vcxproj

@@ -304,6 +304,7 @@
     <ClInclude Include="Routine.hpp" />
     <ClInclude Include="Thread.hpp" />
     <ClInclude Include="Traits.hpp" />
+    <ClInclude Include="Traits.inl" />
     <ClInclude Include="x86.hpp" />
   </ItemGroup>
   <ItemGroup>

src/Reactor/Reactor.vcxproj.filters

@@ -74,5 +74,8 @@
     <ClInclude Include="Traits.hpp">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="Traits.inl">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
 </Project>
\ No newline at end of file

src/Reactor/Traits.hpp

@@ -91,7 +91,7 @@ namespace rr
 	template<typename T> struct CToReactorPtrT<T, typename std::enable_if< IsDefined< CToReactorT<T> >::value>::type >
 	{
 		using type = Pointer< CToReactorT<T> >;
-		static type cast(T v) { return type(v); }
+		static inline type cast(T v); // implemented in Traits.inl
 	};
 
 	// CToReactor specialization for pointer types.
@@ -103,7 +103,7 @@ namespace rr
 	{
 		using elem = typename std::remove_pointer<T>::type;
 		using type = CToReactorPtr<elem>;
-		static type cast(T v) { return type(v); }
+		static inline type cast(T v); // implemented in Traits.inl
 	};
 
 	// CToReactor specialization for void*.
@@ -111,7 +111,7 @@ namespace rr
 	template<> struct CToReactor<void*>
 	{
 		using type = Pointer<Byte>;
-		static type cast(void* v);
+		static type cast(void* v); // implemented in Reactor.cpp
 	};
 
 	// CToReactor specialization for void*.
@@ -119,7 +119,7 @@ namespace rr
 	template<> struct CToReactor<const char*>
 	{
 		using type = Pointer<Byte>;
-		static type cast(const char* v);
+		static type cast(const char* v); // implemented in Reactor.cpp
 	};
 
 	// CToReactor specialization for enum types.
@@ -128,7 +128,7 @@ namespace rr
 	{
 		using underlying = typename std::underlying_type<T>::type;
 		using type = CToReactorT<underlying>;
-		static type cast(T v) { return type(v); }
+		static type cast(T v); // implemented in Traits.inl
 	};
 
 	// IsRValue::value is true if T is of type RValue<X>, where X is any type.

src/Reactor/Traits.inl

+// Copyright 2019 The SwiftShader Authors. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//    http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#ifndef rr_Traits_inl
+#define rr_Traits_inl
+
+namespace rr
+{
+	template<typename T>
+	Pointer<CToReactorT<T>>
+	CToReactorPtrT<T, typename std::enable_if< IsDefined< CToReactorT<T> >::value>::type >::cast(T v)
+	{
+		return type(v);
+	}
+
+	template<typename T>
+	CToReactorPtr<typename std::remove_pointer<T>::type>
+	CToReactor<T, typename std::enable_if<std::is_pointer<T>::value>::type>::cast(T v)
+	{
+		return type(v);
+	}
+
+	template<typename T>
+	CToReactorT<typename std::underlying_type<T>::type>
+	CToReactor<T, typename std::enable_if<std::is_enum<T>::value>::type>::cast(T v)
+	{
+		return type(v);
+	}
+
+} // namespace rr
+
+#endif // rr_Traits_inl