Skip to content

Commit

Permalink
Don't use virtual inheritance for variant value hierarchy
Browse files Browse the repository at this point in the history
  • Loading branch information
CelticMinstrel committed Apr 3, 2017
1 parent 48d111a commit bcb014c
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions src/formula/variant_value.hpp
Expand Up @@ -155,7 +155,7 @@ class variant_value_base
* Base class for numeric variant values. Currently only supports a value stored as an
* integer, but for now, that's all that's necessary.
*/
class variant_numeric : public virtual variant_value_base
class variant_numeric : public variant_value_base
{
public:
explicit variant_numeric(int value) : value_(value) {}
Expand Down Expand Up @@ -185,7 +185,7 @@ class variant_numeric : public virtual variant_value_base
};


class variant_int : public virtual variant_numeric
class variant_int : public variant_numeric
{
public:
explicit variant_int(int value) : variant_numeric(value) {}
Expand Down Expand Up @@ -215,7 +215,7 @@ class variant_int : public virtual variant_numeric
};


class variant_decimal : public virtual variant_numeric
class variant_decimal : public variant_numeric
{
public:
explicit variant_decimal(int value) : variant_numeric(value) {}
Expand Down Expand Up @@ -259,7 +259,7 @@ class variant_decimal : public virtual variant_numeric
};


class variant_callable : public virtual variant_value_base
class variant_callable : public variant_value_base
{
public:
explicit variant_callable(const formula_callable* callable);
Expand Down Expand Up @@ -302,7 +302,7 @@ class variant_callable : public virtual variant_value_base
};


class variant_string : public virtual variant_value_base
class variant_string : public variant_value_base
{
public:
explicit variant_string(const std::string& str) : string_(str) {}
Expand Down Expand Up @@ -361,7 +361,7 @@ class variant_string : public virtual variant_value_base
* create a new derived class specialized to a specific container type.
*/
template<typename T>
class variant_container : public virtual variant_value_base
class variant_container : public variant_value_base
{
public:
explicit variant_container(const T& container)
Expand Down

0 comments on commit bcb014c

Please sign in to comment.