yet more updates on the quest for a good windows compile :)

sara-27 · May 29, 2016 · 7697889 · 7697889
1 parent abd4c42
commit 7697889
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/examples/general/CMakeLists.txt b/examples/general/CMakeLists.txt
@@ -2,7 +2,13 @@
 #pi             readfile       sum
 
 add_subdirectory( pi )
+##
+# take out if windows since not that many have bzlib installed
+##
+if( NOT ${CMAKE_SYSTEM_NAME} MATCHES "Windows" )
 add_subdirectory( rbzip2 )
+endif( NOT ${CMAKE_SYSTEM_NAME} MATCHES "Windows" )
+
 add_subdirectory( multiply )
 add_subdirectory( readfile )
 add_subdirectory( singlequeue )

diff --git a/raftinc/random.tcc b/raftinc/random.tcc
@@ -36,7 +36,9 @@ public:
     template <class ... Args > 
     random_variate( const std::size_t N, 
                     Args&&... params ) : parallel_k(),
-                                         gen( std::chrono::system_clock::now().time_since_epoch().count() ),
+        gen( 
+         static_cast< typename GENERATOR::result_type >( 
+            std::chrono::system_clock::now().time_since_epoch().count() ) ),
                                          dist( std::forward< Args >( params )... ),
                                          N( N )
     {
@@ -51,7 +53,8 @@ public:
     }
 
     random_variate( const random_variate &other ) : parallel_k(),
-                                                    gen( std::chrono::system_clock::now().time_since_epoch().count() ),
+       gen( static_cast< typename GENERATOR::result_type >( 
+            std::chrono::system_clock::now().time_since_epoch().count() ) ),
                                                     dist( other.dist ),
                                                     N( other.N )
     {