Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(4182)

Unified Diff: device/generic_sensor/public/cpp/sensor_reading.h

Issue 2587883002: Fix ODR violations caused by mojoms being included in multiple components. (Closed)
Patch Set: Created 4 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: device/generic_sensor/public/cpp/sensor_reading.h
diff --git a/device/generic_sensor/public/cpp/sensor_reading.h b/device/generic_sensor/public/cpp/sensor_reading.h
index 7e8dd64eced31e942a393f369dce31b4cb3d8ca7..bd1f7d08057a76eb0c5d5d314dd28b4c8dfb0b09 100644
--- a/device/generic_sensor/public/cpp/sensor_reading.h
+++ b/device/generic_sensor/public/cpp/sensor_reading.h
@@ -6,7 +6,7 @@
#define DEVICE_GENERIC_SENSOR_PUBLIC_CPP_SENSOR_READING_H_
#include "device/base/synchronization/one_writer_seqlock.h"
-#include "device/generic_sensor/generic_sensor_export.h"
+#include "device/generic_sensor/public/cpp/generic_sensor_public_export.h"
#include "device/generic_sensor/public/interfaces/sensor.mojom.h"
namespace device {
@@ -40,7 +40,7 @@ class SensorReadingField {
};
// This structure represents sensor reading data: timestamp and 3 values.
-struct DEVICE_GENERIC_SENSOR_EXPORT SensorReading {
+struct DEVICE_GENERIC_SENSOR_PUBLIC_EXPORT SensorReading {
SensorReading();
~SensorReading();
SensorReading(const SensorReading& other);
@@ -50,7 +50,7 @@ struct DEVICE_GENERIC_SENSOR_EXPORT SensorReading {
// This structure represents sensor reading buffer: sensor reading and seqlock
// for synchronization.
-struct DEVICE_GENERIC_SENSOR_EXPORT SensorReadingSharedBuffer {
+struct DEVICE_GENERIC_SENSOR_PUBLIC_EXPORT SensorReadingSharedBuffer {
SensorReadingSharedBuffer();
~SensorReadingSharedBuffer();
SensorReadingField<OneWriterSeqLock> seqlock;
« no previous file with comments | « device/generic_sensor/public/cpp/platform_sensor_configuration.h ('k') | device/generic_sensor/public/interfaces/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698