Skip to content

Commit 90c526d

Browse files
committed
Fix ODR violation
Signed-off-by: Christian Vetter <christian.vetter@here.com>
1 parent 39eae9d commit 90c526d

9 files changed

Lines changed: 11 additions & 11 deletions

File tree

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
#include "types.h"
1+
#include "types.h"
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
class A : public flatdata::Archive
1+
class A : public flatdata::Archive
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
cluster__n
1+
cluster__import_types
22
{
3-
penwidth=0;
3+
penwidth=0;
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
cluster__app
22
{
3-
penwidth=0;
3+
penwidth=0;

flatdata-generator/tests/generators/flatdata_expectations/imports/simple/main.flatdata

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
namespace n {
1+
namespace import_types {
22
struct S
33
{
44
x : u32 : 32;
@@ -9,6 +9,6 @@ struct S
99
namespace app {
1010
archive A
1111
{
12-
data : vector< .n.S >;
12+
data : vector< .import_types.S >;
1313
}
1414
}
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
class n_S(flatdata.structure.Structure):
1+
class import_types_S(flatdata.structure.Structure):
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
pub use super::super::types::n::*;
1+
pub use super::super::types::import_types::*;
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import "types.flatdata";
22
namespace app {
33
archive A {
4-
data : vector< .n.S >;
4+
data : vector< .import_types.S >;
55
}
66
}

test_cases/imports/simple/types.flatdata

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
namespace n {
1+
namespace import_types {
22
struct S {
33
x : u32 : 32;
44
y : u32 : 32;

0 commit comments

Comments
 (0)