Skip to content

Commit b8d4590

Browse files
author
Michael Carroll
committed
Change to use SuppressWarning from ign-utils
Signed-off-by: Michael Carroll <michael@openrobotics.org>
1 parent 83855aa commit b8d4590

20 files changed

+62
-62
lines changed

include/ignition/sensors/AirPressureSensor.hh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121

2222
#include <sdf/sdf.hh>
2323

24-
#include <ignition/common/SuppressWarning.hh>
24+
#include <ignition/utils/SuppressWarning.hh>
2525

2626
#include <ignition/sensors/config.hh>
2727
#include <ignition/sensors/air_pressure/Export.hh>
@@ -80,11 +80,11 @@ namespace ignition
8080
/// \return Verical reference position in meters
8181
public: double ReferenceAltitude() const;
8282

83-
IGN_COMMON_WARN_IGNORE__DLL_INTERFACE_MISSING
83+
IGN_UTILS_WARN_IGNORE__DLL_INTERFACE_MISSING
8484
/// \brief Data pointer for private data
8585
/// \internal
8686
private: std::unique_ptr<AirPressureSensorPrivate> dataPtr;
87-
IGN_COMMON_WARN_RESUME__DLL_INTERFACE_MISSING
87+
IGN_UTILS_WARN_RESUME__DLL_INTERFACE_MISSING
8888
};
8989
}
9090
}

include/ignition/sensors/AltimeterSensor.hh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121

2222
#include <sdf/sdf.hh>
2323

24-
#include <ignition/common/SuppressWarning.hh>
24+
#include <ignition/utils/SuppressWarning.hh>
2525

2626
#include <ignition/sensors/config.hh>
2727
#include <ignition/sensors/altimeter/Export.hh>
@@ -97,11 +97,11 @@ namespace ignition
9797
/// \return Vertical velocity in meters per second
9898
public: double VerticalVelocity() const;
9999

100-
IGN_COMMON_WARN_IGNORE__DLL_INTERFACE_MISSING
100+
IGN_UTILS_WARN_IGNORE__DLL_INTERFACE_MISSING
101101
/// \brief Data pointer for private data
102102
/// \internal
103103
private: std::unique_ptr<AltimeterSensorPrivate> dataPtr;
104-
IGN_COMMON_WARN_RESUME__DLL_INTERFACE_MISSING
104+
IGN_UTILS_WARN_RESUME__DLL_INTERFACE_MISSING
105105
};
106106
}
107107
}

include/ignition/sensors/CameraSensor.hh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323

2424
#include <sdf/sdf.hh>
2525

26-
#include <ignition/common/SuppressWarning.hh>
26+
#include <ignition/utils/SuppressWarning.hh>
2727

2828
#ifdef _WIN32
2929
#pragma warning(push)
@@ -170,11 +170,11 @@ namespace ignition
170170
/// \param[in] _scene Pointer to the new scene.
171171
private: void OnSceneChange(ignition::rendering::ScenePtr /*_scene*/);
172172

173-
IGN_COMMON_WARN_IGNORE__DLL_INTERFACE_MISSING
173+
IGN_UTILS_WARN_IGNORE__DLL_INTERFACE_MISSING
174174
/// \brief Data pointer for private data
175175
/// \internal
176176
private: std::unique_ptr<CameraSensorPrivate> dataPtr;
177-
IGN_COMMON_WARN_RESUME__DLL_INTERFACE_MISSING
177+
IGN_UTILS_WARN_RESUME__DLL_INTERFACE_MISSING
178178
};
179179
}
180180
}

include/ignition/sensors/DepthCameraSensor.hh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
#include <sdf/sdf.hh>
2525

2626
#include <ignition/common/Event.hh>
27-
#include <ignition/common/SuppressWarning.hh>
27+
#include <ignition/utils/SuppressWarning.hh>
2828

2929
#ifdef _WIN32
3030
#pragma warning(push)
@@ -166,11 +166,11 @@ namespace ignition
166166
private: void OnSceneChange(ignition::rendering::ScenePtr /*_scene*/)
167167
{ }
168168

169-
IGN_COMMON_WARN_IGNORE__DLL_INTERFACE_MISSING
169+
IGN_UTILS_WARN_IGNORE__DLL_INTERFACE_MISSING
170170
/// \brief Data pointer for private data
171171
/// \internal
172172
private: std::unique_ptr<DepthCameraSensorPrivate> dataPtr;
173-
IGN_COMMON_WARN_RESUME__DLL_INTERFACE_MISSING
173+
IGN_UTILS_WARN_RESUME__DLL_INTERFACE_MISSING
174174
};
175175
}
176176
}

include/ignition/sensors/ForceTorqueSensor.hh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222

2323
#include <sdf/sdf.hh>
2424

25-
#include <ignition/common/SuppressWarning.hh>
25+
#include <ignition/utils/SuppressWarning.hh>
2626

2727
#include <ignition/math/Pose3.hh>
2828

@@ -115,11 +115,11 @@ namespace ignition
115115
public: void SetRotationChildInSensor(
116116
const math::Quaterniond &_rotChildInSensor);
117117

118-
IGN_COMMON_WARN_IGNORE__DLL_INTERFACE_MISSING
118+
IGN_UTILS_WARN_IGNORE__DLL_INTERFACE_MISSING
119119
/// \brief Data pointer for private data
120120
/// \internal
121121
private: std::unique_ptr<ForceTorqueSensorPrivate> dataPtr;
122-
IGN_COMMON_WARN_RESUME__DLL_INTERFACE_MISSING
122+
IGN_UTILS_WARN_RESUME__DLL_INTERFACE_MISSING
123123
};
124124
}
125125
}

include/ignition/sensors/GpuLidarSensor.hh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222

2323
#include <sdf/sdf.hh>
2424

25-
#include <ignition/common/SuppressWarning.hh>
25+
#include <ignition/utils/SuppressWarning.hh>
2626

2727
// TODO(louise) Remove these pragmas once ign-rendering is disabling the
2828
// warnings
@@ -128,11 +128,11 @@ namespace ignition
128128
unsigned int _heighti, unsigned int _channels,
129129
const std::string &/*_format*/)> _subscriber) override;
130130

131-
IGN_COMMON_WARN_IGNORE__DLL_INTERFACE_MISSING
131+
IGN_UTILS_WARN_IGNORE__DLL_INTERFACE_MISSING
132132
/// \brief Data pointer for private data
133133
/// \internal
134134
private: std::unique_ptr<GpuLidarSensorPrivate> dataPtr;
135-
IGN_COMMON_WARN_RESUME__DLL_INTERFACE_MISSING
135+
IGN_UTILS_WARN_RESUME__DLL_INTERFACE_MISSING
136136
};
137137
}
138138
}

include/ignition/sensors/ImuSensor.hh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121

2222
#include <sdf/sdf.hh>
2323

24-
#include <ignition/common/SuppressWarning.hh>
24+
#include <ignition/utils/SuppressWarning.hh>
2525
#include <ignition/math/Pose3.hh>
2626

2727
#include <ignition/sensors/config.hh>
@@ -138,11 +138,11 @@ namespace ignition
138138
/// \return Gravity vectory in meters per second squared.
139139
public: math::Vector3d Gravity() const;
140140

141-
IGN_COMMON_WARN_IGNORE__DLL_INTERFACE_MISSING
141+
IGN_UTILS_WARN_IGNORE__DLL_INTERFACE_MISSING
142142
/// \brief Data pointer for private data
143143
/// \internal
144144
private: std::unique_ptr<ImuSensorPrivate> dataPtr;
145-
IGN_COMMON_WARN_RESUME__DLL_INTERFACE_MISSING
145+
IGN_UTILS_WARN_RESUME__DLL_INTERFACE_MISSING
146146
};
147147
}
148148
}

include/ignition/sensors/Lidar.hh

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
#include <string>
2222
#include <vector>
2323

24-
#include <ignition/common/SuppressWarning.hh>
24+
#include <ignition/utils/SuppressWarning.hh>
2525
#include <ignition/common/Event.hh>
2626

2727
#include "ignition/sensors/lidar/Export.hh"
@@ -236,10 +236,10 @@ namespace ignition
236236
// Documentation inherited
237237
public: virtual bool IsActive() const;
238238

239-
IGN_COMMON_WARN_IGNORE__DLL_INTERFACE_MISSING
239+
IGN_UTILS_WARN_IGNORE__DLL_INTERFACE_MISSING
240240
/// \brief Just a mutex for thread safety
241241
public: mutable std::mutex lidarMutex;
242-
IGN_COMMON_WARN_RESUME__DLL_INTERFACE_MISSING
242+
IGN_UTILS_WARN_RESUME__DLL_INTERFACE_MISSING
243243

244244
/// \brief Raw buffer of laser data.
245245
public: float *laserBuffer = nullptr;
@@ -259,11 +259,11 @@ namespace ignition
259259
unsigned int _heighti, unsigned int _channels,
260260
const std::string &/*_format*/)> _subscriber);
261261

262-
IGN_COMMON_WARN_IGNORE__DLL_INTERFACE_MISSING
262+
IGN_UTILS_WARN_IGNORE__DLL_INTERFACE_MISSING
263263
/// \brief Data pointer for private data
264264
/// \internal
265265
private: std::unique_ptr<LidarPrivate> dataPtr;
266-
IGN_COMMON_WARN_RESUME__DLL_INTERFACE_MISSING
266+
IGN_UTILS_WARN_RESUME__DLL_INTERFACE_MISSING
267267
};
268268
}
269269
}

include/ignition/sensors/LogicalCameraSensor.hh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323

2424
#include <sdf/sdf.hh>
2525

26-
#include <ignition/common/SuppressWarning.hh>
26+
#include <ignition/utils/SuppressWarning.hh>
2727

2828
#include <ignition/math/Angle.hh>
2929

@@ -113,11 +113,11 @@ namespace ignition
113113
/// \return List of detected models.
114114
public: msgs::LogicalCameraImage Image() const;
115115

116-
IGN_COMMON_WARN_IGNORE__DLL_INTERFACE_MISSING
116+
IGN_UTILS_WARN_IGNORE__DLL_INTERFACE_MISSING
117117
/// \brief Data pointer for private data
118118
/// \internal
119119
private: std::unique_ptr<LogicalCameraSensorPrivate> dataPtr;
120-
IGN_COMMON_WARN_RESUME__DLL_INTERFACE_MISSING
120+
IGN_UTILS_WARN_RESUME__DLL_INTERFACE_MISSING
121121
};
122122
}
123123
}

include/ignition/sensors/MagnetometerSensor.hh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121

2222
#include <sdf/sdf.hh>
2323

24-
#include <ignition/common/SuppressWarning.hh>
24+
#include <ignition/utils/SuppressWarning.hh>
2525
#include <ignition/math/Pose3.hh>
2626

2727
#include <ignition/sensors/config.hh>
@@ -93,11 +93,11 @@ namespace ignition
9393
/// \return Magnetic field vector in body frame
9494
public: math::Vector3d MagneticField() const;
9595

96-
IGN_COMMON_WARN_IGNORE__DLL_INTERFACE_MISSING
96+
IGN_UTILS_WARN_IGNORE__DLL_INTERFACE_MISSING
9797
/// \brief Data pointer for private data
9898
/// \internal
9999
private: std::unique_ptr<MagnetometerSensorPrivate> dataPtr;
100-
IGN_COMMON_WARN_RESUME__DLL_INTERFACE_MISSING
100+
IGN_UTILS_WARN_RESUME__DLL_INTERFACE_MISSING
101101
};
102102
}
103103
}

0 commit comments

Comments
 (0)