Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 0 additions & 13 deletions backup/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,19 +1,6 @@
cmake_minimum_required(VERSION 2.8.8)
project(HotBackup)

# pick language dialect
check_cxx_compiler_flag(-std=c++03 HAVE_STDCXX03)
if (HAVE_STDCXX03)
set(CMAKE_CXX_FLAGS "-std=c++03 -Wno-deprecated-declarations ${CMAKE_CXX_FLAGS}")
else ()
message(FATAL_ERROR "${CMAKE_CXX_COMPILER} doesn't support -std=c++03, you need one that does.")
endif ()

# No implicit templates, since that's how mysql compiles.
if (NOT CMAKE_CXX_COMPILER_ID MATCHES Clang)
set(CMAKE_CXX_FLAGS "-fno-implicit-templates ${CMAKE_CXX_FLAGS}")
endif ()

set_property(DIRECTORY APPEND PROPERTY COMPILE_DEFINITIONS
_FILE_OFFSET_BITS=64
_LARGEFILE64_SOURCE)
Expand Down
2 changes: 0 additions & 2 deletions backup/copier.cc
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,6 @@ Copyright (c) 2006, 2015, Percona and/or its affiliates. All rights reserved.
#include <unistd.h>
#include <vector>

template class std::vector<char *>;

#if DEBUG_HOTBACKUP
#define WARN(string, arg) HotBackup::CopyWarn(string, arg)
#define TRACE(string, arg) HotBackup::CopyTrace(string, arg)
Expand Down
4 changes: 0 additions & 4 deletions backup/fmap.cc
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,6 @@ Copyright (c) 2006, 2015, Percona and/or its affiliates. All rights reserved.
#include <vector>

class file_description;
template class std::vector<file_description *>;

// This mutx protects the file descriptor map
static pthread_mutex_t get_put_mutex = PTHREAD_MUTEX_INITIALIZER;
Expand Down Expand Up @@ -184,6 +183,3 @@ void fmap::lock_fmap(const backtrace bt) throw() {
void fmap::unlock_fmap(const backtrace bt) throw() {
pmutex_unlock(&get_put_mutex, BACKTRACE(&bt));
}

// Instantiate the templates we need
template class std::vector<description*>;
3 changes: 0 additions & 3 deletions backup/source_file.cc
Original file line number Diff line number Diff line change
Expand Up @@ -341,6 +341,3 @@ void source_file::fd_unlock(void) throw()
{
pmutex_unlock(&m_fd_mutex);
}

// Instantiate the templates we need
template class std::vector<range>;
2 changes: 0 additions & 2 deletions backup/tests/open_close_6731.cc
Original file line number Diff line number Diff line change
Expand Up @@ -175,5 +175,3 @@ int test_main(int argc __attribute__((__unused__)), const char *argv[] __attribu
}
return 0;
}

template class std::vector<int>;
4 changes: 0 additions & 4 deletions backup/tests/test6469_many_enospc_injection.cc
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,3 @@ int test_main(int argc __attribute__((__unused__)), const char *argv[] __attribu
free(src);
return 0;
}

// Instantiate what we need
template class std::vector<int>;
template class std::vector<long>;
4 changes: 0 additions & 4 deletions backup/tests/test6477_close_injection.cc
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,3 @@ int test_main(int argc __attribute__((__unused__)), const char *argv[] __attribu
free(src);
return 0;
}

// Instantiate what we need
template class std::vector<int>;
template class std::vector<long>;
3 changes: 0 additions & 3 deletions backup/tests/test6483_mkdir_injection.cc
Original file line number Diff line number Diff line change
Expand Up @@ -157,6 +157,3 @@ int test_main(int argc __attribute__((__unused__)), const char *argv[] __attribu
free(realdst);
return 0;
}

// Instantiate what we need
template class std::vector<long>;