[Moss-devel] CVS: moss/colpatik/include/modules/input Device.h,1.2,1.3 DeviceInterrupt.h,1.2,1.3

[Manfred Morgner <address@hidden>]

Update of /cvsroot/moss//moss/colpatik/include/modules/input
In directory subversions:/tmp/cvs-serv14492/include/modules/input

Modified Files:
        Device.h DeviceInterrupt.h 
Log Message:
gcc-error found (thanks xandi), used a good pragma for gcc on the wrong place


Index: Device.h
===================================================================
RCS file: /cvsroot/moss//moss/colpatik/include/modules/input/Device.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** Device.h    30 Oct 2002 01:48:48 -0000      1.2
--- Device.h    30 Oct 2002 02:06:12 -0000      1.3
***************
*** 71,83 ****
       *
       *******************************************/
-     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:
--- 71,74 ----
***************
*** 95,98 ****
--- 86,98 ----
        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

Index: DeviceInterrupt.h
===================================================================
RCS file: /cvsroot/moss//moss/colpatik/include/modules/input/DeviceInterrupt.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** DeviceInterrupt.h   30 Oct 2002 01:48:48 -0000      1.2
--- DeviceInterrupt.h   30 Oct 2002 02:06:12 -0000      1.3
***************
*** 38,42 ****
  
  #if __GNUG__ >= 2
! #  pragma interface
  #  endif
  
--- 38,42 ----
  
  #if __GNUG__ >= 2
! //#  pragma interface
  #  endif
  
***************
*** 65,68 ****
--- 65,69 ----
       *
       *******************************************/
+      
      public:
        // abstract Interface
***************
*** 87,91 ****
                                            char              cType = CB_DATA);
        virtual void CallbackFree    (const pfnDeviceCallback fnCallback);
!       
      }; // class CDeviceInterrupt
    
--- 88,92 ----
                                            char              cType = CB_DATA);
        virtual void CallbackFree    (const pfnDeviceCallback fnCallback);
! 
      }; // class CDeviceInterrupt