Fixed some warnings
							parent
							
								
									67f70c37b5
								
							
						
					
					
						commit
						d2cb52ea01
					
				|  | @ -249,7 +249,7 @@ include_directories(BEFORE | |||
| 
 | ||||
| if(MSVC) | ||||
| 	add_definitions(-D_CRT_SECURE_NO_WARNINGS -D_SCL_SECURE_NO_WARNINGS) | ||||
| 	add_definitions(/wd4251 /wd4275 /wd4251 /wd4661) # Disable non-DLL-exported base class and other warnings | ||||
| 	add_definitions(/wd4251 /wd4275 /wd4251 /wd4661 /wd4344) # Disable non-DLL-exported base class and other warnings | ||||
| endif() | ||||
| 
 | ||||
| if(GTSAM_ENABLE_CONSISTENCY_CHECKS) | ||||
|  |  | |||
|  | @ -81,7 +81,7 @@ map<int, double> testWithoutMemoryAllocation() | |||
|     tbb::parallel_for(tbb::blocked_range<size_t>(0, numberOfProblems), WorkerWithoutAllocation(results)); | ||||
|     tbb::tick_count t1 = tbb::tick_count::now(); | ||||
|     cout << "Without memory allocation, grain size = " << grainSize << ", time = " << (t1 - t0).seconds() << endl; | ||||
|     timingResults[grainSize] = (t1 - t0).seconds(); | ||||
|     timingResults[(int)grainSize] = (t1 - t0).seconds(); | ||||
|   } | ||||
| 
 | ||||
|   return timingResults; | ||||
|  |  | |||
|  | @ -120,7 +120,7 @@ namespace gtsam { | |||
| 
 | ||||
|                 // If we have child tasks, start subtasks and wait for them to complete
 | ||||
|                 //postOrderTask.set_ref_count((int) treeNode->children.size());
 | ||||
|                 set_ref_count(treeNode->children.size()); | ||||
|                 set_ref_count((int)treeNode->children.size()); | ||||
|                 spawn(childTasks); | ||||
|                 return firstChild; | ||||
|               } | ||||
|  |  | |||
		Loading…
	
		Reference in New Issue