From fce886410a16ec681338349f821aa0dbf647a3f5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sergi=20Hern=C3=A0ndez=20Juan?= <shernand@iri.upc.edu>
Date: Tue, 29 Nov 2011 09:20:07 +0000
Subject: [PATCH] Changed some data types to avoid problems between 64 and 32
bit machines.
---
src/firewireserver.cpp | 4 ++--
src/firewireserver.h | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/firewireserver.cpp b/src/firewireserver.cpp
index 8c500d7..ac9db77 100644
--- a/src/firewireserver.cpp
+++ b/src/firewireserver.cpp
@@ -130,7 +130,7 @@ void CFirewireServer::get_camera(int id,CFirewireCamera **camera)
this->active_cameras[id]=true;
}
-void CFirewireServer::get_camera_guid(unsigned long long int uid,CFirewireCamera **camera)
+void CFirewireServer::get_camera_guid(uint64_t uid,CFirewireCamera **camera)
{
int i=0;
@@ -189,7 +189,7 @@ void CFirewireServer::get_pgr_stereo_camera(int id,CPGRStereoCamera **camera)
this->active_cameras[id]=true;
}
-void CFirewireServer::get_pgr_stereo_camera_guid(unsigned long long int uid,CPGRStereoCamera **camera)
+void CFirewireServer::get_pgr_stereo_camera_guid(uint64_t uid,CPGRStereoCamera **camera)
{
int i=0;
diff --git a/src/firewireserver.h b/src/firewireserver.h
index c410b36..12662c1 100644
--- a/src/firewireserver.h
+++ b/src/firewireserver.h
@@ -253,7 +253,7 @@ class CFirewireServer
*
*
*/
- void get_camera_guid(unsigned long long int uid, CFirewireCamera **camera);
+ void get_camera_guid(uint64_t uid, CFirewireCamera **camera);
/**
* \brief
*
@@ -265,7 +265,7 @@ class CFirewireServer
*
*
*/
- void get_pgr_stereo_camera_guid(unsigned long long int uid, CPGRStereoCamera **camera);
+ void get_pgr_stereo_camera_guid(uint64_t uid, CPGRStereoCamera **camera);
/**
* \brief Function to free a camera
*
--
GitLab