Skip to content

Commit e58b700

Browse files
committed
Fixed warnings
1 parent f6039a1 commit e58b700

File tree

14 files changed

+146
-139
lines changed

14 files changed

+146
-139
lines changed

FACE/Sequence.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -567,10 +567,10 @@ namespace FaceTypes {
567567
// Members of the Sequence template itself:
568568

569569
template <typename T, typename Bounds, typename Elts>
570-
inline Sequence<T, Bounds, Elts>::Sequence(size_type maximum,
570+
inline Sequence<T, Bounds, Elts>::Sequence(size_type max_len,
571571
size_type length,
572572
T* data, seq_flag_type release)
573-
: AllocPolicy<T, Sequence, Bounds>(maximum)
573+
: AllocPolicy<T, Sequence, Bounds>(max_len)
574574
, length_(length)
575575
, release_(release)
576576
, buffer_(data)
@@ -616,11 +616,11 @@ namespace FaceTypes {
616616
}
617617

618618
template <typename T, typename Bounds, typename Elts>
619-
inline void Sequence<T, Bounds, Elts>::replace_i(size_type maximum,
619+
inline void Sequence<T, Bounds, Elts>::replace_i(size_type max_len,
620620
size_type length, T* data,
621621
seq_flag_type release)
622622
{
623-
Sequence tmp(maximum, length, data, release);
623+
Sequence tmp(max_len, length, data, release);
624624
swap(tmp);
625625
}
626626

dds/idl/langmap_generator.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1583,7 +1583,7 @@ struct Cxx11Generator : GeneratorBase {
15831583
const Classification cls = classify(field_type);
15841584
if (cls & CL_ARRAY) {
15851585
std::string indent(" ");
1586-
NestedForLoops nfl("int", "i",
1586+
NestedForLoops nfl("size_t", "i",
15871587
dynamic_cast<AST_Array*>(field_type), indent, true);
15881588
be_global->impl_ <<
15891589
indent << "if (_" << field_name << nfl.index_ << " != rhs._"

java/idl2jni/tests/simple/simple.idl

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,9 @@ module simple {
107107
TestUnion2 variableUnion;
108108
};
109109

110+
#ifdef USE_LOCAL
111+
local
112+
#endif
110113
interface TestInterf {
111114
TestArrayTypedef op1(in TestEnum p1, inout unsigned short p2,
112115
out TestSeqTypedef p3, out string p4);
@@ -124,10 +127,16 @@ module simple {
124127
default: double fp;
125128
};
126129

130+
#ifdef USE_LOCAL
131+
local
132+
#endif
127133
interface TestInterf2 : TestInterf {
128134
long op2(in TestArrayTypedef p1, in LongSeqSeq p2);
129135
};
130136

137+
#ifdef USE_LOCAL
138+
local
139+
#endif
131140
interface TestInterf3 : TestInterf2 {
132141
void op3(in TestNestedStruct p1);
133142
};

0 commit comments

Comments
 (0)