Merge lp:~jpakkane/unity-api/removenc into lp:unity-api

[Jussi Pakkanen]

Remove deprecated NonCopyable base class.

Remove deprecated NonCopyable base class.

No ABI change because the only user was unity-scopes-api and that has transitioned.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:118
http://jenkins.qa.ubuntu.com/job/unity-api-ci/142/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-api-trusty-amd64-ci/16/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-api-trusty-armhf-ci/16/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-api-trusty-i386-ci/16/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-api-ci/142/rebuild

review: Needs Fixing (continuous-integration)

[lp:~jpakkane/unity-api/removenc]

119. By Jussi Pakkanen on 2013-12-20

X

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:119
http://jenkins.qa.ubuntu.com/job/unity-api-ci/143/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-api-trusty-amd64-ci/17
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-api-trusty-armhf-ci/17
        deb: http://jenkins.qa.ubuntu.com/job/unity-api-trusty-armhf-ci/17/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-api-trusty-i386-ci/17

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-api-ci/143/rebuild

review: Approve (continuous-integration)

[Michi Henning (michihenning)]

+1

review: Approve

=== modified file 'include/unity/util/NonCopyable.h'
--- include/unity/util/NonCopyable.h	2013-12-13 12:04:56 +0000
+++ include/unity/util/NonCopyable.h	2013-12-20 15:25:39 +0000
@@ -33,15 +33,6 @@
 
 #include <unity/SymbolExport.h>
 
-namespace unity
-{
-
-namespace util
-{
-
-namespace NonCopyable_ // Prevent unintended ADL
-{
-
 /**
 \brief Helper macro to prevent a class from being copied.
 
@@ -61,28 +52,4 @@
 
 #define NONCOPYABLE(ClassName) /** Deleted */ ClassName(ClassName const&) = delete; /** Deleted */ ClassName& operator=(ClassName const&) = delete;
 
-/**
- * This class is deprecated and will go away before 14/04 freeze. Use the NONCOPYABLE macro instead or
- * write your own =delete declarations.
- */
-
-class UNITY_API NonCopyable
-{
-protected:
-    NonCopyable() = default;
-    ~NonCopyable() = default;
-
-private:
-    NonCopyable(NonCopyable const&) = delete;
-    NonCopyable& operator=(NonCopyable const&) = delete;
-} __attribute__((deprecated));
-
-} // namespace NonCopyable_
-
-typedef NonCopyable_::NonCopyable NonCopyable __attribute__((deprecated));
-
-} // namespace util
-
-} // namespace unity
-
 #endif

=== modified file 'test/gtest/unity/util/DefinesPtrs/DefinesPtrs_test.cpp'
--- test/gtest/unity/util/DefinesPtrs/DefinesPtrs_test.cpp	2013-12-13 12:04:56 +0000
+++ test/gtest/unity/util/DefinesPtrs/DefinesPtrs_test.cpp	2013-12-20 15:25:39 +0000
@@ -21,8 +21,6 @@
 
 #include <gtest/gtest.h>
 
-using namespace unity::util;
-
 class MyClass
 {
 public: