Ignore:
Timestamp:
12/14/15 12:09:20 (9 years ago)
Author:
DHERBOMEZ Gérald
Message:
  • minor modifications about dllexport and dllimport macros usages
File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/StdDbtPlayerComponents/DbtPlyCPTComponent.h

    r109 r110  
    1717#include "../NMEA0183/include/nmea0183.h"
    1818
    19 //#include <boost/scoped_ptr.hpp>
    20 //#include <QScopedPointer>
    21 
    22 // Export macro for CPT DLL for Windows only
    23 #ifdef WIN32
    24 #   ifdef CPT_EXPORTS
    25         // make DLL
    26 #       define CPT_API __declspec(dllexport)
    27 #   else
    28         // use DLL
    29 #       define CPT_API __declspec(dllimport)
    30 #   endif
    31 #else
    32     // On other platforms, simply ignore this
    33 #   define CPT_API
    34 #endif
    3519
    3620#define UNKNOWN_NMEA_FRAME -1
    3721
    38 struct CPT_API Stream8Position
     22struct PACPUSLIB_API Stream8Position
    3923{
    4024    int32_t dataPos;
    … …  
    4327
    4428
    45 #include "../Gps/structure_gps.h"
    46 //#include "structure/genericStructures.h"
    47 #include "Pacpus/kernel/road_time.h"
     29#include <Pacpus/structures/structure_gps.h>
     30#include <Pacpus/structures/genericStructures.h>
     31#include <Pacpus/kernel/road_time.h>
    4832#include <QVector3D>
    4933#include <QMatrix4x4>
    50 namespace pacpus {
    51 class PacpusTimeStampedData {
    52         public:
    53             road_time_t time;
    54             road_timerange_t timerange;
    55             unsigned int sequenceNumber;
    56         };
    57 class Pose3D : public PacpusTimeStampedData {
    58 public:
    59             QVector3D position;
    60             QVector3D angle;
    61             //QMatrix3x3 poscov;
    62             //QMatrix3x3 angconv;
    63             QMatrix4x4 transform;
    64         };
    65 }
    66 //#include "../PoseViewer/PoseViewer.h"
    6734
    6835namespace pacpus {
    69 
    70 //class PoseViewer;
    7136class ShMem;
    7237
    73 //struct Pose;
    74 
    75 class CPT_API DbtPlyCPTComponent
     38class PACPUSLIB_API DbtPlyCPTComponent
    7639        : public DbtPlyFileManager
    7740{
    … …  
    9356    virtual void addOutputs();
    9457
    95 //Q_SIGNALS:
    96     //void newPoseAvailable(Pose pose);
    97 
    9858private:
    99     //boost::scoped_ptr<PoseViewer> mPoseViewer;
    100    //QScopedPointer<PoseViewer> mPoseViewer;
    101 
    10259    //ShMems
    10360    ShMem * mShMem;
    … …  
    10764    QString mDataFilename;
    10865
    109     //NMEA to do
    110     NMEA0183 nmea0183_;
    111 
     66    // NMEA0183
    11267    trame_gga_dbl ggaFrame_;
    11368    trame_gsa gsaFrame_;
Note: See TracChangeset for help on using the changeset viewer.