diff options
Diffstat (limited to 'src/dpl')
-rw-r--r-- | src/dpl/core/include/cchecker/dpl/assert.h (renamed from src/dpl/core/include/dpl/assert.h) | 2 | ||||
-rw-r--r-- | src/dpl/core/include/cchecker/dpl/availability.h (renamed from src/dpl/core/include/dpl/availability.h) | 0 | ||||
-rw-r--r-- | src/dpl/core/include/cchecker/dpl/char_traits.h (renamed from src/dpl/core/include/dpl/char_traits.h) | 3 | ||||
-rw-r--r-- | src/dpl/core/include/cchecker/dpl/colors.h (renamed from src/dpl/core/include/dpl/colors.h) | 0 | ||||
-rw-r--r-- | src/dpl/core/include/cchecker/dpl/errno_string.h (renamed from src/dpl/core/include/dpl/errno_string.h) | 3 | ||||
-rw-r--r-- | src/dpl/core/include/cchecker/dpl/exception.h (renamed from src/dpl/core/include/dpl/exception.h) | 0 | ||||
-rw-r--r-- | src/dpl/core/include/cchecker/dpl/noncopyable.h (renamed from src/dpl/core/include/dpl/noncopyable.h) | 0 | ||||
-rw-r--r-- | src/dpl/core/include/cchecker/dpl/noreturn.h (renamed from src/dpl/core/include/dpl/noreturn.h) | 0 | ||||
-rw-r--r-- | src/dpl/core/include/cchecker/dpl/optional.h (renamed from src/dpl/core/include/dpl/optional.h) | 2 | ||||
-rw-r--r-- | src/dpl/core/include/cchecker/dpl/scoped_array.h (renamed from src/dpl/core/include/dpl/scoped_array.h) | 4 | ||||
-rw-r--r-- | src/dpl/core/include/cchecker/dpl/scoped_free.h (renamed from src/dpl/core/include/dpl/scoped_free.h) | 2 | ||||
-rw-r--r-- | src/dpl/core/include/cchecker/dpl/scoped_resource.h (renamed from src/dpl/core/include/dpl/scoped_resource.h) | 2 | ||||
-rw-r--r-- | src/dpl/core/include/cchecker/dpl/string.h (renamed from src/dpl/core/include/dpl/string.h) | 5 | ||||
-rw-r--r-- | src/dpl/core/src/assert.cpp | 4 | ||||
-rw-r--r-- | src/dpl/core/src/char_traits.cpp | 3 | ||||
-rw-r--r-- | src/dpl/core/src/colors.cpp | 3 | ||||
-rw-r--r-- | src/dpl/core/src/errno_string.cpp | 11 | ||||
-rw-r--r-- | src/dpl/core/src/exception.cpp | 2 | ||||
-rw-r--r-- | src/dpl/core/src/noncopyable.cpp | 3 | ||||
-rw-r--r-- | src/dpl/core/src/string.cpp | 10 | ||||
-rw-r--r-- | src/dpl/db/include/cchecker/dpl/db/naive_synchronization_object.h (renamed from src/dpl/db/include/dpl/db/naive_synchronization_object.h) | 2 | ||||
-rw-r--r-- | src/dpl/db/include/cchecker/dpl/db/sql_connection.h (renamed from src/dpl/db/include/dpl/db/sql_connection.h) | 10 | ||||
-rw-r--r-- | src/dpl/db/src/naive_synchronization_object.cpp | 3 | ||||
-rw-r--r-- | src/dpl/db/src/sql_connection.cpp | 11 |
24 files changed, 47 insertions, 38 deletions
diff --git a/src/dpl/core/include/dpl/assert.h b/src/dpl/core/include/cchecker/dpl/assert.h index 936c71e..03dd7d0 100644 --- a/src/dpl/core/include/dpl/assert.h +++ b/src/dpl/core/include/cchecker/dpl/assert.h @@ -22,7 +22,7 @@ #ifndef CCHECKER_ASSERT_H #define CCHECKER_ASSERT_H -#include <dpl/noreturn.h> +#include <cchecker/dpl/noreturn.h> namespace CCHECKER { // Assertion handler procedure diff --git a/src/dpl/core/include/dpl/availability.h b/src/dpl/core/include/cchecker/dpl/availability.h index b1cb894..b1cb894 100644 --- a/src/dpl/core/include/dpl/availability.h +++ b/src/dpl/core/include/cchecker/dpl/availability.h diff --git a/src/dpl/core/include/dpl/char_traits.h b/src/dpl/core/include/cchecker/dpl/char_traits.h index e76f48b..06e2840 100644 --- a/src/dpl/core/include/dpl/char_traits.h +++ b/src/dpl/core/include/cchecker/dpl/char_traits.h @@ -29,7 +29,8 @@ #include <string> #include <ostream> #include <algorithm> -#include <dpl/exception.h> + +#include <cchecker/dpl/exception.h> namespace CCHECKER { typedef std::char_traits<wchar_t> CharTraits; diff --git a/src/dpl/core/include/dpl/colors.h b/src/dpl/core/include/cchecker/dpl/colors.h index d652f5b..d652f5b 100644 --- a/src/dpl/core/include/dpl/colors.h +++ b/src/dpl/core/include/cchecker/dpl/colors.h diff --git a/src/dpl/core/include/dpl/errno_string.h b/src/dpl/core/include/cchecker/dpl/errno_string.h index 498b2af..c98eba3 100644 --- a/src/dpl/core/include/dpl/errno_string.h +++ b/src/dpl/core/include/cchecker/dpl/errno_string.h @@ -22,10 +22,11 @@ #ifndef CCHECKER_ERRNO_STRING_H #define CCHECKER_ERRNO_STRING_H -#include <dpl/exception.h> #include <string> #include <cerrno> +#include <cchecker/dpl/exception.h> + namespace CCHECKER { DECLARE_EXCEPTION_TYPE(CCHECKER::Exception, InvalidErrnoValue) diff --git a/src/dpl/core/include/dpl/exception.h b/src/dpl/core/include/cchecker/dpl/exception.h index f7b9afc..f7b9afc 100644 --- a/src/dpl/core/include/dpl/exception.h +++ b/src/dpl/core/include/cchecker/dpl/exception.h diff --git a/src/dpl/core/include/dpl/noncopyable.h b/src/dpl/core/include/cchecker/dpl/noncopyable.h index 747299c..747299c 100644 --- a/src/dpl/core/include/dpl/noncopyable.h +++ b/src/dpl/core/include/cchecker/dpl/noncopyable.h diff --git a/src/dpl/core/include/dpl/noreturn.h b/src/dpl/core/include/cchecker/dpl/noreturn.h index 6eaaa64..6eaaa64 100644 --- a/src/dpl/core/include/dpl/noreturn.h +++ b/src/dpl/core/include/cchecker/dpl/noreturn.h diff --git a/src/dpl/core/include/dpl/optional.h b/src/dpl/core/include/cchecker/dpl/optional.h index 6aca7bd..42d1bd4 100644 --- a/src/dpl/core/include/dpl/optional.h +++ b/src/dpl/core/include/cchecker/dpl/optional.h @@ -22,7 +22,7 @@ #ifndef CCHECKER_OPTIONAL_H #define CCHECKER_OPTIONAL_H -#include <dpl/exception.h> +#include <cchecker/dpl/exception.h> namespace CCHECKER { template <typename Type> diff --git a/src/dpl/core/include/dpl/scoped_array.h b/src/dpl/core/include/cchecker/dpl/scoped_array.h index ca6a02b..54c0c80 100644 --- a/src/dpl/core/include/dpl/scoped_array.h +++ b/src/dpl/core/include/cchecker/dpl/scoped_array.h @@ -24,8 +24,8 @@ #include <cstddef> -#include <dpl/assert.h> -#include <dpl/scoped_resource.h> +#include <cchecker/dpl/assert.h> +#include <cchecker/dpl/scoped_resource.h> namespace CCHECKER { template<typename Class> diff --git a/src/dpl/core/include/dpl/scoped_free.h b/src/dpl/core/include/cchecker/dpl/scoped_free.h index 9be17b7..d8fee50 100644 --- a/src/dpl/core/include/dpl/scoped_free.h +++ b/src/dpl/core/include/cchecker/dpl/scoped_free.h @@ -26,7 +26,7 @@ #include <malloc.h> #include <cstddef> -#include <dpl/scoped_resource.h> +#include <cchecker/dpl/scoped_resource.h> namespace CCHECKER { template<typename Class> diff --git a/src/dpl/core/include/dpl/scoped_resource.h b/src/dpl/core/include/cchecker/dpl/scoped_resource.h index c024684..2b3c72d 100644 --- a/src/dpl/core/include/dpl/scoped_resource.h +++ b/src/dpl/core/include/cchecker/dpl/scoped_resource.h @@ -22,7 +22,7 @@ #ifndef CCHECKER_SCOPED_RESOURCE_H #define CCHECKER_SCOPED_RESOURCE_H -#include <dpl/noncopyable.h> +#include <cchecker/dpl/noncopyable.h> namespace CCHECKER { template<typename ClassPolicy> diff --git a/src/dpl/core/include/dpl/string.h b/src/dpl/core/include/cchecker/dpl/string.h index a271e5a..d9c3bbd 100644 --- a/src/dpl/core/include/dpl/string.h +++ b/src/dpl/core/include/cchecker/dpl/string.h @@ -21,12 +21,13 @@ #ifndef CCHECKER_STRING #define CCHECKER_STRING -#include <dpl/exception.h> -#include <dpl/char_traits.h> #include <string> #include <ostream> #include <numeric> +#include <cchecker/dpl/exception.h> +#include <cchecker/dpl/char_traits.h> + namespace CCHECKER { // @brief CCHECKER string typedef std::basic_string<wchar_t, CharTraits> String; diff --git a/src/dpl/core/src/assert.cpp b/src/dpl/core/src/assert.cpp index c8aed8f..2050617 100644 --- a/src/dpl/core/src/assert.cpp +++ b/src/dpl/core/src/assert.cpp @@ -20,10 +20,10 @@ * @brief This file is the implementation file of assert */ #include <stddef.h> -#include <dpl/assert.h> #include <cstdlib> -#include <dpl/exception.h> +#include <cchecker/dpl/assert.h> +#include <cchecker/dpl/exception.h> #include <cchecker/log.h> namespace CCHECKER { diff --git a/src/dpl/core/src/char_traits.cpp b/src/dpl/core/src/char_traits.cpp index 32b9197..d142cb2 100644 --- a/src/dpl/core/src/char_traits.cpp +++ b/src/dpl/core/src/char_traits.cpp @@ -23,7 +23,8 @@ * performance */ #include <stddef.h> -#include <dpl/char_traits.h> + +#include <cchecker/dpl/char_traits.h> // // Note: diff --git a/src/dpl/core/src/colors.cpp b/src/dpl/core/src/colors.cpp index 25feadf..272c06b 100644 --- a/src/dpl/core/src/colors.cpp +++ b/src/dpl/core/src/colors.cpp @@ -21,7 +21,8 @@ * and html output */ #include <stddef.h> -#include <dpl/colors.h> + +#include <cchecker/dpl/colors.h> namespace CCHECKER { namespace Colors { diff --git a/src/dpl/core/src/errno_string.cpp b/src/dpl/core/src/errno_string.cpp index e481a02..5b1de37 100644 --- a/src/dpl/core/src/errno_string.cpp +++ b/src/dpl/core/src/errno_string.cpp @@ -20,11 +20,6 @@ * @brief This file is the implementation file of errno string */ #include <stddef.h> -#include <dpl/errno_string.h> -#include <dpl/assert.h> -#include <dpl/exception.h> -#include <dpl/assert.h> -#include <dpl/scoped_free.h> #include <string> #include <cstddef> #include <cstring> @@ -32,6 +27,12 @@ #include <cerrno> #include <stdexcept> +#include <cchecker/dpl/errno_string.h> +#include <cchecker/dpl/assert.h> +#include <cchecker/dpl/exception.h> +#include <cchecker/dpl/assert.h> +#include <cchecker/dpl/scoped_free.h> + namespace CCHECKER { namespace // anonymous { diff --git a/src/dpl/core/src/exception.cpp b/src/dpl/core/src/exception.cpp index 5f2e8e0..d26e13c 100644 --- a/src/dpl/core/src/exception.cpp +++ b/src/dpl/core/src/exception.cpp @@ -20,9 +20,9 @@ * @brief This file is the implementation of exception system */ #include <stddef.h> -#include <dpl/exception.h> #include <cstdio> +#include <cchecker/dpl/exception.h> #include <cchecker/log.h> namespace CCHECKER { diff --git a/src/dpl/core/src/noncopyable.cpp b/src/dpl/core/src/noncopyable.cpp index 1ae80e9..6e6f50c 100644 --- a/src/dpl/core/src/noncopyable.cpp +++ b/src/dpl/core/src/noncopyable.cpp @@ -20,7 +20,8 @@ * @brief This file is the implementation file of noncopyable */ #include <stddef.h> -#include <dpl/noncopyable.h> + +#include <cchecker/dpl/noncopyable.h> namespace CCHECKER { Noncopyable::Noncopyable() diff --git a/src/dpl/core/src/string.cpp b/src/dpl/core/src/string.cpp index cdc83ec..d22aaba 100644 --- a/src/dpl/core/src/string.cpp +++ b/src/dpl/core/src/string.cpp @@ -20,11 +20,6 @@ * @version 1.0 */ #include <stddef.h> -#include <dpl/string.h> -#include <dpl/char_traits.h> -#include <dpl/errno_string.h> -#include <dpl/exception.h> -#include <dpl/scoped_array.h> #include <string> #include <vector> #include <algorithm> @@ -33,6 +28,11 @@ #include <iconv.h> #include <unicode/ustring.h> +#include <cchecker/dpl/string.h> +#include <cchecker/dpl/char_traits.h> +#include <cchecker/dpl/errno_string.h> +#include <cchecker/dpl/exception.h> +#include <cchecker/dpl/scoped_array.h> #include <cchecker/log.h> // TODO: Completely move to ICU diff --git a/src/dpl/db/include/dpl/db/naive_synchronization_object.h b/src/dpl/db/include/cchecker/dpl/db/naive_synchronization_object.h index 687d666..8836635 100644 --- a/src/dpl/db/include/dpl/db/naive_synchronization_object.h +++ b/src/dpl/db/include/cchecker/dpl/db/naive_synchronization_object.h @@ -23,7 +23,7 @@ #ifndef CCHECKER_NAIVE_SYNCHRONIZATION_OBJECT_H #define CCHECKER_NAIVE_SYNCHRONIZATION_OBJECT_H -#include <dpl/db/sql_connection.h> +#include <cchecker/dpl/db/sql_connection.h> namespace CCHECKER { namespace DB { diff --git a/src/dpl/db/include/dpl/db/sql_connection.h b/src/dpl/db/include/cchecker/dpl/db/sql_connection.h index 321372b..8af5a58 100644 --- a/src/dpl/db/include/dpl/db/sql_connection.h +++ b/src/dpl/db/include/cchecker/dpl/db/sql_connection.h @@ -22,17 +22,17 @@ #ifndef CCHECKER_SQL_CONNECTION_H #define CCHECKER_SQL_CONNECTION_H -#include <dpl/noncopyable.h> -#include <dpl/exception.h> -#include <dpl/optional.h> #include <memory> -#include <dpl/string.h> #include <sqlite3.h> #include <string> -#include <dpl/assert.h> #include <memory> #include <stdint.h> +#include <cchecker/dpl/string.h> +#include <cchecker/dpl/assert.h> +#include <cchecker/dpl/noncopyable.h> +#include <cchecker/dpl/exception.h> +#include <cchecker/dpl/optional.h> #include <cchecker/log.h> namespace CCHECKER { diff --git a/src/dpl/db/src/naive_synchronization_object.cpp b/src/dpl/db/src/naive_synchronization_object.cpp index 2592c3c..18eeefb 100644 --- a/src/dpl/db/src/naive_synchronization_object.cpp +++ b/src/dpl/db/src/naive_synchronization_object.cpp @@ -21,10 +21,11 @@ * synchronization object */ #include <stddef.h> -#include <dpl/db/naive_synchronization_object.h> #include <chrono> #include <thread> +#include <cchecker/dpl/db/naive_synchronization_object.h> + namespace { unsigned int seed = time(NULL); } diff --git a/src/dpl/db/src/sql_connection.cpp b/src/dpl/db/src/sql_connection.cpp index 27ea4fd..65c04ec 100644 --- a/src/dpl/db/src/sql_connection.cpp +++ b/src/dpl/db/src/sql_connection.cpp @@ -20,16 +20,17 @@ * @brief This file is the implementation file of SQL connection */ #include <stddef.h> -#include <dpl/db/sql_connection.h> -#include <dpl/db/naive_synchronization_object.h> -#include <dpl/scoped_free.h> -#include <dpl/noncopyable.h> -#include <dpl/assert.h> #include <db-util.h> #include <unistd.h> #include <cstdio> #include <cstdarg> +#include <cchecker/dpl/scoped_free.h> +#include <cchecker/dpl/noncopyable.h> +#include <cchecker/dpl/assert.h> +#include <cchecker/dpl/db/sql_connection.h> +#include <cchecker/dpl/db/naive_synchronization_object.h> + namespace CCHECKER { namespace DB { namespace // anonymous |