Merge remote-tracking branch 'remotes/origin/master'

Conflicts: src/cxxopts.hpp
2014-10-30 08:56:29 +11:00 · 2014-10-30 08:56:29 +11:00 · f4c429390f
commit f4c429390f
parent fdf49ba719 1bf66a40ff
1 changed files with 4 additions and 0 deletions
--- a/src/cxxopts.hpp
+++ b/src/cxxopts.hpp
@ -586,7 +586,11 @@ namespace cxxopts
    const T&
    as() const
    {
+#ifdef CXXOPTS_NO_RTTI
+      return static_cast<const values::standard_value<T>&>(*m_value).get();
+#else
      return dynamic_cast<const values::standard_value<T>&>(*m_value).get();
+#endif
    }

    private: