Commit ee2f83d5 authored by Heiko Becker's avatar Heiko Becker
Browse files

Get rid of checking for std::tr1::shared_pointer

We require C++11 and with that it should not be necessary to include/
use tr1.
parent 63618916
......@@ -78,17 +78,6 @@ find_package(Canberra)
# ALSA is an optional dependency
find_package(ALSA)
# TODO: this test is probably obsolete by now
include(CheckCXXSourceCompiles)
check_cxx_source_compiles("
#include <memory>
int main() { std::shared_ptr<int> p; return 0; }
" HAVE_STD_SHARED_PTR)
check_cxx_source_compiles("
#include <tr1/memory>
int main() { std::tr1::shared_ptr<int> p; return 0; }
" HAVE_STD_TR1_SHARED_PTR)
####################################################################################################
########### compile definitions ####################################################################
####################################################################################################
......@@ -99,14 +88,6 @@ add_definitions(-DTRANSLATION_DOMAIN=\"kmix\")
add_definitions(-DKMIX_VERSION=\"${KMIX_VERSION}\")
add_definitions(-DKMIX_CONFIG_VERSION=${KMIX_CONFIG_VERSION})
if (HAVE_STD_SHARED_PTR)
add_definitions(-DHAVE_STD_SHARED_PTR)
else (HAVE_STD_SHARED_PTR)
if (HAVE_STD_TR1_SHARED_PTR)
add_definitions(-DHAVE_STD_TR1_SHARED_PTR)
endif (HAVE_STD_TR1_SHARED_PTR)
endif (HAVE_STD_SHARED_PTR)
if (ALSA_FOUND)
set(HAVE_LIBASOUND2 TRUE)
add_definitions(-DHAVE_LIBASOUND2)
......
......@@ -23,13 +23,8 @@
#include "kmixcore_export.h"
#if defined(HAVE_STD_SHARED_PTR)
#include <memory>
using std::shared_ptr;
#elif defined(HAVE_STD_TR1_SHARED_PTR)
#include <tr1/memory>
using std::tr1::shared_ptr;
#endif
#include <QString>
......
......@@ -21,13 +21,8 @@
#ifndef MixDevice_h
#define MixDevice_h
#if defined(HAVE_STD_SHARED_PTR)
#include <memory>
using std::shared_ptr;
#elif defined(HAVE_STD_TR1_SHARED_PTR)
#include <tr1/memory>
using std::tr1::shared_ptr;
#endif
//KMix
#include "core/MediaController.h"
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment