[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Moss-devel] CVS: moss/colpatik/include/modules/input Device.h,1.1,1.2 D
From: |
Manfred Morgner <address@hidden> |
Subject: |
[Moss-devel] CVS: moss/colpatik/include/modules/input Device.h,1.1,1.2 DeviceInterrupt.h,1.1,1.2 DevicePoll.h,1.1,1.2 DeviceQuery.h,1.1,1.2 Event.h,1.4,1.5 Queue.h,1.2,1.3 |
Date: |
Tue, 29 Oct 2002 20:48:50 -0500 |
Update of /cvsroot/moss//moss/colpatik/include/modules/input
In directory subversions:/tmp/cvs-serv4477/include/modules/input
Modified Files:
Device.h DeviceInterrupt.h DevicePoll.h DeviceQuery.h Event.h
Queue.h
Log Message:
searching th eproblem, while gcc returns an error
Index: Device.h
===================================================================
RCS file: /cvsroot/moss//moss/colpatik/include/modules/input/Device.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** Device.h 28 Oct 2002 22:42:29 -0000 1.1
--- Device.h 30 Oct 2002 01:48:48 -0000 1.2
***************
*** 31,98 ****
#define __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>
#include <list>
!
#include "API_Device.h"
!
! typedef std::list<colpatik::pfnDeviceCallback> CListCallback;
namespace colpatik
! {
class CDevice
! {
! protected:
! static long s_nNoValue;
protected:
! std::string m_sURI;
! CListCallback m_lpfnDataCallback;
! CListCallback m_lpfnStatusCallback;
! long m_nError;
public:
! CDevice(std::string sURI = "");
virtual ~CDevice();
!
! /*******************************************
! *
! * interface
! *
! *******************************************/
! public:
! // abstract Interface
! virtual long GetVersion() = 0;
! virtual long GetType() = 0;
! virtual double GetPollingIntervall() = 0;
! virtual long GetCapabilities() = 0;
! virtual long GetFunctions() = 0;
! virtual void GetInfo(long& rnVersion,
! long& rnType,
! long& rnCapabilities,
! long& rnFunctions) = 0;
! virtual long GetData(TDeviceData& rstData) = 0;
!
! public:
! // virtual Interface
! virtual long GetErrorLast();
! virtual long GetErrorText(std::string& rsError,
! long nError = 0);
!
! virtual bool CallbackRegister(const pfnDeviceCallback fnCallback,
! char cType = CB_DATA);
! virtual void CallbackFree (const pfnDeviceCallback fnCallback);
!
}; // class CDevice
} // namespace colpatik
#endif // __DEVICE_H
--- 31,102 ----
#define __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>
#include <list>
!
#include "API_Device.h"
!
! typedef std::list<colpatik::pfnDeviceCallback> CListCallback;
namespace colpatik
! {
class CDevice
! {
! protected:
! static long s_nNoValue;
protected:
! std::string m_sURI;
! CListCallback m_lpfnCallbackData;
! CListCallback m_lpfnCallbackStatus;
! long m_nError;
public:
! CDevice(const std::string& rsURI = "");
virtual ~CDevice();
!
! /*******************************************
! *
! * interface
! *
! *******************************************/
! public:
! // virtual Interface
! virtual long GetErrorLast();
! virtual long GetErrorText(std::string& rsError,
! long nError = 0);
!
! virtual bool CallbackRegister(const pfnDeviceCallback fnCallback,
! char cType = CB_DATA);
! virtual void CallbackFree (const pfnDeviceCallback fnCallback);
!
! public:
!
! // abstract Interface
! virtual long GetVersion() = 0;
! virtual long GetType() = 0;
! virtual double GetPollingIntervall() = 0;
! virtual long GetCapabilities() = 0;
! virtual long GetFunctions() = 0;
! virtual void GetInfo(long& rnVersion,
! long& rnType,
! long& rnCapabilities,
! long& rnFunctions) = 0;
! virtual long GetData(TDeviceData& rstData) = 0;
!
!
}; // class CDevice
+
} // namespace colpatik
+
#endif // __DEVICE_H
Index: DeviceInterrupt.h
===================================================================
RCS file: /cvsroot/moss//moss/colpatik/include/modules/input/DeviceInterrupt.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** DeviceInterrupt.h 28 Oct 2002 22:42:29 -0000 1.1
--- DeviceInterrupt.h 30 Oct 2002 01:48:48 -0000 1.2
***************
*** 54,61 ****
protected:
! time_t m_dTime; // system time
public:
! CDeviceInterrupt(std::string sURI = "");
virtual ~CDeviceInterrupt();
--- 54,61 ----
protected:
! time_t m_dTime; // system time
public:
! CDeviceInterrupt(const std::string& rsURI = "");
virtual ~CDeviceInterrupt();
Index: DevicePoll.h
===================================================================
RCS file: /cvsroot/moss//moss/colpatik/include/modules/input/DevicePoll.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** DevicePoll.h 28 Oct 2002 22:42:29 -0000 1.1
--- DevicePoll.h 30 Oct 2002 01:48:48 -0000 1.2
***************
*** 31,42 ****
#define __DEVICE_POLL_H
! #if _MSC_VER >= 1000
! # pragma once
! # pragma warning (disable : 4786)
! # endif // _MSC_VER >= 1000
!
! #if __GNU__ >= 2
! # pragma interface
! #endif // #if __GNU__ >= 2
--- 31,42 ----
#define __DEVICE_POLL_H
! #if _MSC_VER >= 1000
! # pragma once
! # pragma warning (disable : 4786)
! # endif // _MSC_VER >= 1000
!
! #if __GNU__ >= 2
! # pragma interface
! #endif // #if __GNU__ >= 2
***************
*** 50,61 ****
class CDevicePoll : public CDevice
{
! private:
! typedef CDevice inherited;
!
protected:
double m_dIntervall; // in ms
public:
! CDevicePoll(std::string sURI = "");
virtual ~CDevicePoll();
--- 50,61 ----
class CDevicePoll : public CDevice
{
! private:
! typedef CDevice inherited;
!
protected:
double m_dIntervall; // in ms
public:
! CDevicePoll(const std::string& rsURI = "");
virtual ~CDevicePoll();
Index: DeviceQuery.h
===================================================================
RCS file: /cvsroot/moss//moss/colpatik/include/modules/input/DeviceQuery.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** DeviceQuery.h 28 Oct 2002 22:42:29 -0000 1.1
--- DeviceQuery.h 30 Oct 2002 01:48:48 -0000 1.2
***************
*** 31,42 ****
#define __DEVICE_QUERY_H
! #if _MSC_VER >= 1000
! #pragma once
! #pragma warning (disable : 4786)
! #endif // _MSC_VER >= 1000
!
! #if __GNU__ >= 2
! # pragma interface
! #endif // #if __GNU__ >= 2
--- 31,42 ----
#define __DEVICE_QUERY_H
! #if _MSC_VER >= 1000
! # pragma once
! # pragma warning (disable : 4786)
! # endif // _MSC_VER >= 1000
!
! #if __GNU__ >= 2
! # pragma interface
! # endif // #if __GNU__ >= 2
***************
*** 50,61 ****
class CDeviceQuery : public CDevice
{
! private:
! typedef CDevice inherited;
!
protected:
double m_dTimeout; // in ms
public:
! CDeviceQuery(std::string sURI = "");
virtual ~CDeviceQuery();
// virtual ~CDeviceQuery();
--- 50,61 ----
class CDeviceQuery : public CDevice
{
! private:
! typedef CDevice inherited;
!
protected:
double m_dTimeout; // in ms
public:
! CDeviceQuery(const std::string& rsURI = "");
virtual ~CDeviceQuery();
// virtual ~CDeviceQuery();
Index: Event.h
===================================================================
RCS file: /cvsroot/moss//moss/colpatik/include/modules/input/Event.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** Event.h 14 Jul 2002 21:41:29 -0000 1.4
--- Event.h 30 Oct 2002 01:48:48 -0000 1.5
***************
*** 38,48 ****
#if _MSC_VER >= 1000
! #pragma once
! #pragma warning (disable : 4786)
! #endif // _MSC_VER >= 1000
#if __GNU__ >= 2
# pragma interface
! #endif // #if __GNU__ >= 2
#include <time.h>
--- 38,49 ----
#if _MSC_VER >= 1000
! # pragma once
! # pragma warning (disable : 4786)
! # endif // _MSC_VER >= 1000
#if __GNU__ >= 2
# pragma interface
! # endif // #if __GNU__ >= 2
!
#include <time.h>
***************
*** 82,87 ****
CEvent& operator = ( CEvent& src);
const TEvent& operator = (const TEvent& src);
-
- operator const TEvent& ();
protected:
--- 83,86 ----
Index: Queue.h
===================================================================
RCS file: /cvsroot/moss//moss/colpatik/include/modules/input/Queue.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** Queue.h 13 Jul 2002 14:07:39 -0000 1.2
--- Queue.h 30 Oct 2002 01:48:48 -0000 1.3
***************
*** 36,47 ****
#if _MSC_VER >= 1000
! #pragma once
! #endif // _MSC_VER >= 1000
#if __GNU__ >= 2
# pragma interface
! #endif // #if __GNU__ >= 2
!
! #pragma warning (disable : 4786)
--- 36,46 ----
#if _MSC_VER >= 1000
! # pragma once
! # pragma warning (disable : 4786)
! # endif // _MSC_VER >= 1000
#if __GNU__ >= 2
# pragma interface
! # endif // #if __GNU__ >= 2
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Moss-devel] CVS: moss/colpatik/include/modules/input Device.h,1.1,1.2 DeviceInterrupt.h,1.1,1.2 DevicePoll.h,1.1,1.2 DeviceQuery.h,1.1,1.2 Event.h,1.4,1.5 Queue.h,1.2,1.3,
Manfred Morgner <address@hidden> <=
- Prev by Date:
[Moss-devel] CVS: moss/colpatik/src Makefile.am,1.7,1.8 main.cxx,1.3,1.4
- Next 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
- Previous by thread:
[Moss-devel] CVS: moss/colpatik/src Makefile.am,1.7,1.8 main.cxx,1.3,1.4
- Next 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
- Index(es):