Fixed wordrep not working when compiled with Visual Studio.

mit-nlp · May 18, 2018 · 15bed49 · 15bed49
1 parent 3418994
commit 15bed49
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 27 deletions.
diff --git a/dlib/dlib/matrix/matrix_data_layout.h b/dlib/dlib/matrix/matrix_data_layout.h
@@ -429,21 +429,24 @@ namespace dlib
             }
 
             T& operator() (
-                long r, 
-                long c
-            ) { return data[r*nc_ + c]; }
+                size_t r, 
+                size_t c
+            ) 
+            {
+                return data[r*nc_ + c]; 
+            }
 
             const T& operator() (
-                long r, 
-                long c
+                size_t r, 
+                size_t c
             ) const { return data[r*nc_ + c]; }
 
             T& operator() (
-                long i 
+                size_t i 
             ) { return data[i]; }
 
             const T& operator() (
-                long i 
+                size_t i 
             ) const { return data[i]; }
 
             void swap(
@@ -463,8 +466,8 @@ namespace dlib
             ) const { return nc_; }
 
             void set_size (
-                long nr,
-                long nc
+                size_t nr,
+                size_t nc
             )
             {
                 if (data) 
@@ -842,21 +845,21 @@ namespace dlib
             }
 
             T& operator() (
-                long r, 
-                long c
+                size_t r, 
+                size_t c
             ) { return data[c*nr_ + r]; }
 
             const T& operator() (
-                long r, 
-                long c
+                size_t r,
+                size_t c
             ) const { return data[c*nr_ + r]; }
 
             T& operator() (
-                long i 
+                size_t i
             ) { return data[i]; }
 
             const T& operator() (
-                long i 
+                size_t i
             ) const { return data[i]; }
 
             void swap(
@@ -876,8 +879,8 @@ namespace dlib
             ) const { return nc_; }
 
             void set_size (
-                long nr,
-                long nc
+                size_t nr,
+                size_t nc
             )
             {
                 if (data) 

diff --git a/dlib/dlib/memory_manager/memory_manager_kernel_1.h b/dlib/dlib/memory_manager/memory_manager_kernel_1.h
@@ -14,7 +14,7 @@ namespace dlib
 
     template <
         typename T,
-        unsigned long max_pool_size
+        size_t max_pool_size
         >
     class memory_manager_kernel_1
     {
@@ -86,11 +86,11 @@ namespace dlib
             }
         }
 
-        unsigned long get_number_of_allocations (
+        size_t get_number_of_allocations (
         ) const { return allocations; }
 
         T* allocate_array (
-            unsigned long size
+            size_t size
         )
         {
             T* temp = new T[size];
@@ -183,9 +183,9 @@ namespace dlib
     private:
 
         // data members
-        unsigned long allocations;
+        size_t allocations;
         node* next;
-        unsigned long pool_size;
+        size_t pool_size;
 
         // restricted functions
         memory_manager_kernel_1(memory_manager_kernel_1&);        // copy constructor
@@ -231,11 +231,11 @@ namespace dlib
         {
         }
 
-        unsigned long get_number_of_allocations (
+        size_t get_number_of_allocations (
         ) const { return allocations; }
 
         T* allocate_array (
-            unsigned long size
+            size_t size
         )
         {
             T* temp = new T[size];
@@ -277,7 +277,7 @@ namespace dlib
     private:
 
         // data members
-        unsigned long allocations;
+        size_t allocations;
 
         // restricted functions
         memory_manager_kernel_1(memory_manager_kernel_1&);        // copy constructor
@@ -288,7 +288,7 @@ namespace dlib
 
     template <
         typename T,
-        unsigned long max_pool_size
+        size_t max_pool_size
         >
     inline void swap (
         memory_manager_kernel_1<T,max_pool_size>& a, 

diff --git a/dlib/dlib/memory_manager_stateless/memory_manager_stateless_kernel_1.h b/dlib/dlib/memory_manager_stateless/memory_manager_stateless_kernel_1.h
@@ -47,7 +47,7 @@ namespace dlib
             }
 
             T* allocate_array (
-                unsigned long size
+                size_t size
             ) 
             { 
                 return new T[size];