[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Moss-devel] CVS: moss/colpatik/include API_Applications.h,1.1,1.2 API_D
|
From: |
Manfred Morgner <address@hidden> |
|
Subject: |
[Moss-devel] CVS: moss/colpatik/include API_Applications.h,1.1,1.2 API_Device.h,1.1,1.2 |
|
Date: |
Tue, 29 Oct 2002 20:48:50 -0500 |
Update of /cvsroot/moss//moss/colpatik/include
In directory subversions:/tmp/cvs-serv4477/include
Modified Files:
API_Applications.h API_Device.h
Log Message:
searching th eproblem, while gcc returns an error
Index: API_Applications.h
===================================================================
RCS file: /cvsroot/moss//moss/colpatik/include/API_Applications.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** API_Applications.h 28 Oct 2002 22:42:28 -0000 1.1
--- API_Applications.h 30 Oct 2002 01:48:47 -0000 1.2
***************
*** 1,5 ****
/***************************************************************************
! API_ApplicationsInterface.h
! ---------------------------
begin : Tue Apr 30 2002
copyright : (C) 2002 by Manfred Morgner
--- 1,5 ----
/***************************************************************************
! API_Applications.h
! ---------------------
begin : Tue Apr 30 2002
copyright : (C) 2002 by Manfred Morgner
***************
*** 10,46 ****
***************************************************************************/
! /***************************************************************************
! * *
! * This program is free software; you can redistribute it and/or modify *
! * it under the terms of the GNU General Public License as published by *
! * the Free Software Foundation; either version 2 of the License, or *
! * (at your option) any later version. *
! * *
! * This program is distributed in the hope that it will be useful, *
! * but WITHOUT ANY WARRANTY; without even the implied warranty of *
! * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
! * GNU General Public License for more details. *
! * *
! * You should have received a copy of the GNU General Public License *
! * along with this program; if not, write to the *
! * *
! * Free Software Foundation, Inc., *
! * 59 Temple Place Suite 330, *
! * Boston, MA 02111-1307, USA. *
! * *
! ***************************************************************************/
!
! #ifndef __API_APPLICATIONS_INTERFACE_H
! #define __API_APPLICATIONS_INTERFACE_H
!
! #if _MSC_VER >= 1000
! #pragma once
! #pragma warning (disable : 4786)
! #endif // _MSC_VER >= 1000
!
! #if __GNU__ >= 2
! # pragma interface
! #endif // #if __GNU__ >= 2
!
namespace colpatik
--- 10,46 ----
***************************************************************************/
! /***************************************************************************
! * *
! * This program is free software; you can redistribute it and/or modify *
! * it under the terms of the GNU General Public License as published by *
! * the Free Software Foundation; either version 2 of the License, or *
! * (at your option) any later version. *
! * *
! * This program is distributed in the hope that it will be useful, *
! * but WITHOUT ANY WARRANTY; without even the implied warranty of *
! * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
! * GNU General Public License for more details. *
! * *
! * You should have received a copy of the GNU General Public License *
! * along with this program; if not, write to the *
! * *
! * Free Software Foundation, Inc., *
! * 59 Temple Place Suite 330, *
! * Boston, MA 02111-1307, USA. *
! * *
! ***************************************************************************/
!
! #ifndef __API_APPLICATIONS_H
! #define __API_APPLICATIONS_H
!
! #if _MSC_VER >= 1000
! # pragma once
! # pragma warning (disable : 4786)
! # endif // _MSC_VER >= 1000
!
! #if __GNU__ >= 2
! # pragma interface
! #endif // #if __GNU__ >= 2
!
namespace colpatik
***************
*** 56,66 ****
// the appropiate class definition
class CEntity : public TEntity
! {
! private:
! typedef TEntity inherited;
!
! public:
! CEntity();
! virtual ~CEntity();
}; // class CEntity
--- 56,66 ----
// the appropiate class definition
class CEntity : public TEntity
! {
! private:
! typedef TEntity inherited;
!
! public:
! CEntity() {};
! virtual ~CEntity() {};
}; // class CEntity
***************
*** 81,85 ****
time_t tLocalTime;
long nData;
! long nInfo;
PDeviceData pData;
} TMessage, *PMessage;
--- 81,85 ----
time_t tLocalTime;
long nData;
! long nInfo;
PDeviceData pData;
} TMessage, *PMessage;
***************
*** 87,97 ****
// the appropiate class definition
class CMessage : public TMessage
! {
! private:
! typedef TMessage inherited;
!
! public:
! CMessage();
! virtual ~CMessage();
}; // CMessage
--- 87,97 ----
// the appropiate class definition
class CMessage : public TMessage
! {
! private:
! typedef TMessage inherited;
!
! public:
! CMessage() {};
! virtual ~CMessage() {};
}; // CMessage
***************
*** 104,106 ****
} // namespace colpatik
! #endif // __API_APPLICATIONS_INTERFACE_H
--- 104,106 ----
} // namespace colpatik
! #endif // __API_APPLICATIONS_H
Index: API_Device.h
===================================================================
RCS file: /cvsroot/moss//moss/colpatik/include/API_Device.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** API_Device.h 28 Oct 2002 22:42:28 -0000 1.1
--- API_Device.h 30 Oct 2002 01:48:47 -0000 1.2
***************
*** 1,4 ****
/***************************************************************************
! API_DeviceInterface.h - description
-------------------
begin : Tue Apr 30 2002
--- 1,4 ----
/***************************************************************************
! API_Device.h - description
-------------------
begin : Tue Apr 30 2002
***************
*** 10,55 ****
***************************************************************************/
! /***************************************************************************
! * *
! * This program is free software; you can redistribute it and/or modify *
! * it under the terms of the GNU General Public License as published by *
! * the Free Software Foundation; either version 2 of the License, or *
! * (at your option) any later version. *
! * *
! * This program is distributed in the hope that it will be useful, *
! * but WITHOUT ANY WARRANTY; without even the implied warranty of *
! * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
! * GNU General Public License for more details. *
! * *
! * You should have received a copy of the GNU General Public License *
! * along with this program; if not, write to the *
! * *
! * Free Software Foundation, Inc., *
! * 59 Temple Place Suite 330, *
! * Boston, MA 02111-1307, USA. *
! * *
! ***************************************************************************/
!
! #ifndef __API_DEVICE_INTERFACE_H
! #define __API_DEVICE_INTERFACE_H
!
! #if _MSC_VER >= 1000
! #pragma once
! #pragma warning (disable : 4786)
! #endif // _MSC_VER >= 1000
!
! #if __GNU__ >= 2
! # pragma interface
! #endif // #if __GNU__ >= 2
!
#include <string>
namespace colpatik
! {
typedef long HDriver;
!
// loads a driver
! // returns: 0 for error or other value for success
// rnResult contains the error code if the functions returns with
error
HDriver DriverLoad(const std::string& rsDriver, long& rnResult);
--- 10,55 ----
***************************************************************************/
! /***************************************************************************
! * *
! * This program is free software; you can redistribute it and/or modify *
! * it under the terms of the GNU General Public License as published by *
! * the Free Software Foundation; either version 2 of the License, or *
! * (at your option) any later version. *
! * *
! * This program is distributed in the hope that it will be useful, *
! * but WITHOUT ANY WARRANTY; without even the implied warranty of *
! * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
! * GNU General Public License for more details. *
! * *
! * You should have received a copy of the GNU General Public License *
! * along with this program; if not, write to the *
! * *
! * Free Software Foundation, Inc., *
! * 59 Temple Place Suite 330, *
! * Boston, MA 02111-1307, USA. *
! * *
! ***************************************************************************/
!
! #ifndef __API_DEVICE_H
! #define __API_DEVICE_H
!
! #if _MSC_VER >= 1000
! # pragma once
! # pragma warning (disable : 4786)
! # endif // _MSC_VER >= 1000
!
! #if __GNU__ >= 2
! # pragma interface
! # endif // #if __GNU__ >= 2
!
#include <string>
namespace colpatik
! {
typedef long HDriver;
!
// loads a driver
! // returns: 0 for error or other value for success
// rnResult contains the error code if the functions returns with
error
HDriver DriverLoad(const std::string& rsDriver, long& rnResult);
***************
*** 103,111 ****
// return all values of the previouse funcitons at ones
! void DriverGetInfo(const HDriver& rhDriver,
long& rnVersion,
long& rnType,
long& rnCapabilities,
long& rnFunctions);
typedef
struct tagDeviceData
--- 103,112 ----
// return all values of the previouse funcitons at ones
! void DriverGetInfo(const HDriver& rhDriver,
long& rnVersion,
long& rnType,
long& rnCapabilities,
long& rnFunctions);
+
typedef
struct tagDeviceData
***************
*** 120,132 ****
class CDeviceData : protected TDeviceData
! {
! private:
! typedef TDeviceData inherited;
public:
CDeviceData();
- CDeviceData(const CDeviceData& roSrc);
CDeviceData(const TDeviceData& rstSrc);
- CDeviceData(const PDeviceData pstSrc);
virtual ~CDeviceData();
--- 121,131 ----
class CDeviceData : protected TDeviceData
! {
! private:
! typedef TDeviceData inherited;
public:
CDeviceData();
CDeviceData(const TDeviceData& rstSrc);
virtual ~CDeviceData();
***************
*** 139,143 ****
virtual const std::string& operator = (const std::string& rsData);
! void InitBasics();
}; // class CDeviceData
--- 138,142 ----
virtual const std::string& operator = (const std::string& rsData);
! void InitBasics() {};
}; // class CDeviceData
***************
*** 146,150 ****
// 0 - success
// not 0 - no success
! long DriverDataGet(const HDriver& rhDriver,
TDeviceData& rstData);
--- 145,149 ----
// 0 - success
// not 0 - no success
! long DriverDataGet(const HDriver& rhDriver,
TDeviceData& rstData);
***************
*** 154,159 ****
// gets an error text for an error number, if "nError" == 0,
// the function returns the text for the last error
! long DriverErrorTextGet(const HDriver& rhDriver,
! std::string& rsError,
long nError = 0);
--- 153,158 ----
// gets an error text for an error number, if "nError" == 0,
// the function returns the text for the last error
! long DriverErrorTextGet(const HDriver& rhDriver,
! std::string& rsError,
long nError = 0);
***************
*** 167,176 ****
// register the callback in the driver
! bool DriverCallbackRegister(const HDriver& rhDriver,
! const pfnDeviceCallback fnCallback,
! char cType = CB_DATA);
// inform the driver, that the given callback is dead now
! void DriverCallbackFree (const HDriver& rhDriver,
const pfnDeviceCallback fnCallback);
--- 166,175 ----
// register the callback in the driver
! bool DriverCallbackRegister(const HDriver& rhDriver,
! const pfnDeviceCallback fnCallback,
! char cType = CB_DATA);
// inform the driver, that the given callback is dead now
! void DriverCallbackFree (const HDriver& rhDriver,
const pfnDeviceCallback fnCallback);
***************
*** 180,183 ****
} // namespace colpatik
!
! #endif // __API_DEVICE_INTERFACE_H
--- 179,182 ----
} // namespace colpatik
!
! #endif // __API_DEVICE_H
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Moss-devel] CVS: moss/colpatik/include API_Applications.h,1.1,1.2 API_Device.h,1.1,1.2,
Manfred Morgner <address@hidden> <=
- Prev by Date:
[Moss-devel] CVS: moss/colpatik/src/modules/input ColpatikInput.cxx,1.4,1.5 Device.cxx,1.1,1.2 DeviceInterrupt.cxx,1.1,1.2 DevicePoll.cxx,1.1,1.2 DeviceQuery.cxx,1.1,1.2 Event.cxx,1.5,1.6 Makefile.am,1.2,1.3 Queue.cxx,1.4,1.5
- Next by Date:
[Moss-devel] CVS: moss/colpatik/include/modules/input Device.h,1.2,1.3 DeviceInterrupt.h,1.2,1.3
- Previous by thread:
[Moss-devel] CVS: moss/colpatik/src/modules/input ColpatikInput.cxx,1.4,1.5 Device.cxx,1.1,1.2 DeviceInterrupt.cxx,1.1,1.2 DevicePoll.cxx,1.1,1.2 DeviceQuery.cxx,1.1,1.2 Event.cxx,1.5,1.6 Makefile.am,1.2,1.3 Queue.cxx,1.4,1.5
- Next by thread:
[Moss-devel] CVS: moss/colpatik/include/modules/input Device.h,1.2,1.3 DeviceInterrupt.h,1.2,1.3
- Index(es):