Commit b94fc342 authored by Davis King's avatar Davis King

Just renamed the timer source files.

--HG--
rename : dlib/timer/timer_kernel_2.cpp => dlib/timer/timer.cpp
rename : dlib/timer/timer_kernel_2.h => dlib/timer/timer.h
rename : dlib/timer/timer_kernel_abstract.h => dlib/timer/timer_abstract.h
rename : dlib/timer/timer_kernel_1.h => dlib/timer/timer_heavy.h
parent f6ad04c8
...@@ -47,7 +47,7 @@ ...@@ -47,7 +47,7 @@
#include "../threads/threads_kernel_2.cpp" #include "../threads/threads_kernel_2.cpp"
#include "../threads/threads_kernel_shared.cpp" #include "../threads/threads_kernel_shared.cpp"
#include "../threads/thread_pool_extension.cpp" #include "../threads/thread_pool_extension.cpp"
#include "../timer/timer_kernel_2.cpp" #include "../timer/timer.cpp"
#include "../stack_trace.cpp" #include "../stack_trace.cpp"
#ifdef DLIB_PNG_SUPPORT #ifdef DLIB_PNG_SUPPORT
......
...@@ -3,8 +3,8 @@ ...@@ -3,8 +3,8 @@
#ifndef DLIB_TIMEr_ #ifndef DLIB_TIMEr_
#define DLIB_TIMEr_ #define DLIB_TIMEr_
#include "timer/timer_kernel_1.h" #include "timer/timer.h"
#include "timer/timer_kernel_2.h" #include "timer/timer_heavy.h"
#endif // DLIB_TIMEr_ #endif // DLIB_TIMEr_
// Copyright (C) 2007 Davis E. King (davis@dlib.net) // Copyright (C) 2007 Davis E. King (davis@dlib.net)
// License: Boost Software License See LICENSE.txt for the full license. // License: Boost Software License See LICENSE.txt for the full license.
#ifndef DLIB_TIMER_KERNEl_2_CPP #ifndef DLIB_TIMER_cPP__
#define DLIB_TIMER_KERNEl_2_CPP #define DLIB_TIMER_cPP__
#include "timer_kernel_2.h" #include "timer.h"
namespace dlib namespace dlib
{ {
...@@ -204,5 +204,5 @@ namespace dlib ...@@ -204,5 +204,5 @@ namespace dlib
} }
#endif // DLIB_TIMER_KERNEl_2_CPP #endif // DLIB_TIMER_cPP__
// Copyright (C) 2007 Davis E. King (davis@dlib.net) // Copyright (C) 2007 Davis E. King (davis@dlib.net)
// License: Boost Software License See LICENSE.txt for the full license. // License: Boost Software License See LICENSE.txt for the full license.
#ifndef DLIB_TIMER_KERNEl_2_ #ifndef DLIB_TIMEr_H__
#define DLIB_TIMER_KERNEl_2_ #define DLIB_TIMEr_H__
#include "../threads.h" #include "../threads.h"
#include "../algs.h" #include "../algs.h"
#include "../misc_api.h" #include "../misc_api.h"
#include "timer_kernel_abstract.h" #include "timer_abstract.h"
#include "../uintn.h" #include "../uintn.h"
#include "../binary_search_tree.h" #include "../binary_search_tree.h"
#include "../smart_pointers_thread_safe.h" #include "../smart_pointers_thread_safe.h"
#include "timer_kernel_1.h" #include "timer_heavy.h"
namespace dlib namespace dlib
{ {
...@@ -418,9 +418,9 @@ namespace dlib ...@@ -418,9 +418,9 @@ namespace dlib
} }
#ifdef NO_MAKEFILE #ifdef NO_MAKEFILE
#include "timer_kernel_2.cpp" #include "timer.cpp"
#endif #endif
#endif // DLIB_TIMER_KERNEl_2_ #endif // DLIB_TIMEr_H__
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
#include "../threads.h" #include "../threads.h"
#include "../algs.h" #include "../algs.h"
#include "../misc_api.h" #include "../misc_api.h"
#include "timer_kernel_abstract.h" #include "timer_abstract.h"
namespace dlib namespace dlib
{ {
......
Markdown is supported
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