diff options
| -rw-r--r-- | lib/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | lib/nullptr.h | 7 | ||||
| -rw-r--r-- | lib/vehicleproperty.h | 9 | ||||
| -rw-r--r-- | plugins/dbus/abstractdbusinterface.h | 1 |
4 files changed, 10 insertions, 9 deletions
diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt index 32058dd6..69e12c25 100644 --- a/lib/CMakeLists.txt +++ b/lib/CMakeLists.txt @@ -1,5 +1,5 @@ set(amb_sources abstractpropertytype.cpp abstractroutingengine.cpp listplusplus.cpp abstractsink.cpp vehicleproperty.cpp abstractsource.cpp debugout.cpp) -set(amb_headers_install abstractpropertytype.h abstractroutingengine.h listplusplus.h abstractsink.h vehicleproperty.h debugout.h abstractsource.h) +set(amb_headers_install abstractpropertytype.h nullptr.h abstractroutingengine.h listplusplus.h abstractsink.h vehicleproperty.h debugout.h abstractsource.h) include_directories( ${include_dirs} ) add_library(amb SHARED ${amb_sources}) diff --git a/lib/nullptr.h b/lib/nullptr.h new file mode 100644 index 00000000..4d05370d --- /dev/null +++ b/lib/nullptr.h @@ -0,0 +1,7 @@ +#define GCC_VERSION (__GNUC__ * 10000 \ + + __GNUC_MINOR__ * 100 \ + + __GNUC_PATCHLEVEL__) + +#if GCC_VERSION < 40600 +#define nullptr 0 +#endif diff --git a/lib/vehicleproperty.h b/lib/vehicleproperty.h index 200ec72b..58c13d17 100644 --- a/lib/vehicleproperty.h +++ b/lib/vehicleproperty.h @@ -20,14 +20,7 @@ #ifndef VEHICLEPROPERTY_H #define VEHICLEPROPERTY_H -#define GCC_VERSION (__GNUC__ * 10000 \ - + __GNUC_MINOR__ * 100 \ - + __GNUC_PATCHLEVEL__) - -#if GCC_VERSION < 40600 -#define nullptr 0 -#endif - +#include "nullptr.h" #include <string> #include <list> #include <set> diff --git a/plugins/dbus/abstractdbusinterface.h b/plugins/dbus/abstractdbusinterface.h index b786e4fb..fae9e19e 100644 --- a/plugins/dbus/abstractdbusinterface.h +++ b/plugins/dbus/abstractdbusinterface.h @@ -24,6 +24,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA #include <unordered_map> #include <gio/gio.h> #include <boost/any.hpp> +#include <nullptr.h> class AbstractProperty; |