diff options
| author | Marcelo Lira <marcelo.lira@openbossa.org> | 2010-03-04 16:34:45 -0300 |
|---|---|---|
| committer | Marcelo Lira <marcelo.lira@openbossa.org> | 2010-03-04 17:13:40 -0300 |
| commit | f4db0c74e0f267c102fff6eb47ecc3eae628a637 (patch) | |
| tree | e988b735d382f9d814078a9fba2009f9d6a38a39 /tests/libother | |
| parent | dbeca960863dadbe8d496195bc60202619314214 (diff) | |
| parent | edc9cbfcfde439ccfe7100f53efc5d1e4ec34480 (diff) | |
Merge branch 'master' into extensibleconversions
Conflicts:
cppgenerator.cpp
libshiboken/basewrapper.cpp
Reviewed by Hugo Parente <hugo.lima@openbossa.org>
Reviewed by Lauro Moura <lauro.neto@openbossa.org>
Diffstat (limited to 'tests/libother')
| -rw-r--r-- | tests/libother/number.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/libother/number.h b/tests/libother/number.h index bbbd830ba..d739802d8 100644 --- a/tests/libother/number.h +++ b/tests/libother/number.h @@ -47,7 +47,7 @@ public: Str toStr() const; operator Str() const { return toStr(); } -protected: +private: int m_value; }; #endif // NUMBER_H |