error.hpp belongs to src/lib

2008-12-27 00:53:35 +01:00 · 2008-12-27 00:53:35 +01:00 · e921b1658c
commit e921b1658c
parent 0bd0cfc549
39 changed files with 37 additions and 39 deletions
--- a/src/backend/mediaaccessfacade.hpp
+++ b/src/backend/mediaaccessfacade.hpp
@ -26,7 +26,7 @@


 #include "lib/singleton.hpp"
-#include "include/error.hpp"
+#include "lib/error.hpp"



--- a/src/common/appstate.cpp
+++ b/src/common/appstate.cpp
@ -21,7 +21,7 @@
 * *****************************************************/


-#include "include/error.hpp"
+#include "lib/error.hpp"
 #include "include/lifecycle.h"
 #include "common/appstate.hpp"
 #include "lib/lifecycleregistry.hpp"
--- a/src/common/guifacade.cpp
+++ b/src/common/guifacade.cpp
@ -23,7 +23,7 @@

 #include "gui/guifacade.hpp"
 #include "include/guinotificationfacade.h"
-#include "include/error.hpp"
+#include "lib/error.hpp"
 #include "lib/singleton.hpp"
 #include "lib/functorutil.hpp"
 #include "common/instancehandle.hpp"
--- a/src/common/interfaceproxy.cpp
+++ b/src/common/interfaceproxy.cpp
@ -24,7 +24,7 @@
 #include "lib/singletonsubclass.hpp"
 #include "include/guinotificationfacade.h"
 #include "lib/util.hpp"
-#include "include/error.hpp"
+#include "lib/error.hpp"

 extern "C" {
 #include "common/interface.h"
--- a/src/common/option.cpp
+++ b/src/common/option.cpp
@ -23,7 +23,7 @@

 #include "common/option.hpp"

-#include "include/error.hpp"
+#include "lib/error.hpp"
 #include "lib/util.hpp"


--- a/src/common/subsys.cpp
+++ b/src/common/subsys.cpp
@ -23,7 +23,7 @@

 #include "common/subsys.hpp"

-#include "include/error.hpp"
+#include "lib/error.hpp"
 //#include "lib/util.hpp"


--- a/src/common/subsys.hpp
+++ b/src/common/subsys.hpp
@ -43,7 +43,7 @@
 #ifndef LUMIERA_SUBSYS_H
 #define LUMIERA_SUBSYS_H

-#include "include/error.hpp"
+#include "lib/error.hpp"
 #include "common/option.hpp"

 #include <boost/noncopyable.hpp>
--- a/src/common/subsystemrunner.hpp
+++ b/src/common/subsystemrunner.hpp
@ -24,7 +24,7 @@
 #ifndef LUMIERA_SUBSYSTEMRUNNER_H
 #define LUMIERA_SUBSYSTEMRUNNER_H

-#include "include/error.hpp"
+#include "lib/error.hpp"
 #include "lib/util.hpp"
 #include "common/subsys.hpp"
 #include "lib/multithread.hpp"
--- a/src/include/nobugcfg.h
+++ b/src/include/nobugcfg.h
@ -68,7 +68,7 @@
 #ifdef __cplusplus  /* ============= C++ ================ */

 #include "include/lifecycle.h"
-#include "include/error.hpp"  ///< make assertions throw instead of abort()
+#include "lib/error.hpp"  ///< make assertions throw instead of abort()

 namespace lumiera { 
  void initialise_NoBug ();
--- a/src/lib/Makefile.am
+++ b/src/lib/Makefile.am
@ -46,6 +46,7 @@ liblumiera_la_SOURCES =						\

 noinst_HEADERS +=						\
 	$(liblumiera_la_srcdir)/error.h				\
+	$(liblumiera_la_srcdir)/error.hpp			\
 	$(liblumiera_la_srcdir)/mutex.h				\
 	$(liblumiera_la_srcdir)/rwlock.h			\
 	$(liblumiera_la_srcdir)/condition.h			\
--- a/src/lib/allocationcluster.cpp
+++ b/src/lib/allocationcluster.cpp
@ -22,7 +22,7 @@


 #include "lib/allocationcluster.hpp"
-#include "include/error.hpp"
+#include "lib/error.hpp"
 #include "lib/util.hpp"

 using util::isnil;
--- a/src/lib/allocationcluster.hpp
+++ b/src/lib/allocationcluster.hpp
@ -52,7 +52,7 @@
 #include <boost/noncopyable.hpp>

 #include "lib/multithread.hpp"
-#include "include/error.hpp"
+#include "lib/error.hpp"
 #include "lib/scopedholder.hpp"
 #include "lib/scopedholdertransfer.hpp"

--- a/src/include/error.hpp
+++ b/src/include/error.hpp
--- a/src/lib/exception.cpp
+++ b/src/lib/exception.cpp
@ -22,7 +22,7 @@



-#include "include/error.hpp"
+#include "lib/error.hpp"
 #include "lib/util.hpp"

 #include <exception>
--- a/src/lib/scopedholder.hpp
+++ b/src/lib/scopedholder.hpp
@ -57,7 +57,7 @@

 #include <boost/scoped_ptr.hpp>

-#include "include/error.hpp"
+#include "lib/error.hpp"



--- a/src/lib/scopedholdertransfer.hpp
+++ b/src/lib/scopedholdertransfer.hpp
@ -25,7 +25,7 @@
 #ifndef LIB_SCOPEDHOLDERVECTOR_H
 #define LIB_SCOPEDHOLDERVECTOR_H

-#include "include/error.hpp"
+#include "lib/error.hpp"
 #include <memory>


--- a/src/lib/singletonpolicies.hpp
+++ b/src/lib/singletonpolicies.hpp
@ -35,7 +35,7 @@ This code is heavily inspired by
 #define LUMIERA_SINGLETONPOLICIES_H

 #include "lib/multithread.hpp"
-#include "include/error.hpp"
+#include "lib/error.hpp"

 #include <vector>

--- a/src/lib/test/suite.cpp
+++ b/src/lib/test/suite.cpp
@ -34,7 +34,7 @@
 #include "lib/cmdline.hpp"
 #include "lib/test/suite.hpp"
 #include "lib/test/run.hpp"
-#include "include/error.hpp"
+#include "lib/error.hpp"
 #include "lib/util.hpp"


--- a/src/lib/test/testoption.cpp
+++ b/src/lib/test/testoption.cpp
@ -24,7 +24,7 @@
 #include "lib/test/testoption.hpp"
 #include "lib/test/suite.hpp"

-#include "include/error.hpp"
+#include "lib/error.hpp"



--- a/src/lib/visitordispatcher.hpp
+++ b/src/lib/visitordispatcher.hpp
@ -25,7 +25,7 @@
 #ifndef LUMIERA_VISITORDISPATCHER_H
 #define LUMIERA_VISITORDISPATCHER_H

-#include "include/error.hpp"
+#include "lib/error.hpp"
 #include "lib/util.hpp"
 #include "lib/singleton.hpp"
 #include "lib/multithread.hpp"
--- a/src/lib/visitorpolicies.hpp
+++ b/src/lib/visitorpolicies.hpp
@ -32,7 +32,7 @@
 #ifndef LUMIERA_VISITORPOLICIES_H
 #define LUMIERA_VISITORPOLICIES_H

-#include "include/error.hpp"
+#include "lib/error.hpp"


 namespace lumiera
--- a/src/lumiera/main.cpp
+++ b/src/lumiera/main.cpp
@ -23,7 +23,7 @@


 #include "include/nobugcfg.h"
-#include "include/error.hpp"
+#include "lib/error.hpp"
 #include "common/appstate.hpp"
 #include "common/option.hpp"

--- a/src/proc/asset.hpp
+++ b/src/proc/asset.hpp
@ -57,7 +57,7 @@

 #include "proc/asset/category.hpp"
 #include "include/nobugcfg.h"
-#include "include/error.hpp"
+#include "lib/error.hpp"
 #include "lib/p.hpp"

 #include <boost/type_traits/is_base_of.hpp>
--- a/src/proc/asset/db.hpp
+++ b/src/proc/asset/db.hpp
@ -28,7 +28,7 @@
 #include "pre_a.hpp"

 #include "proc/asset.hpp"
-#include "include/error.hpp"
+#include "lib/error.hpp"

 #include <tr1/memory>
 #include <tr1/unordered_map>
--- a/src/proc/asset/structfactoryimpl.hpp
+++ b/src/proc/asset/structfactoryimpl.hpp
@ -36,7 +36,7 @@

 #include "proc/mobject/session.hpp"
 #include "common/configrules.hpp"
-#include "include/error.hpp"
+#include "lib/error.hpp"
 #include "lib/util.hpp"

 #include <boost/format.hpp>
--- a/src/proc/assetmanager.hpp
+++ b/src/proc/assetmanager.hpp
@ -39,7 +39,7 @@
 #include "pre_a.hpp"

 #include "proc/asset.hpp"
-#include "include/error.hpp"
+#include "lib/error.hpp"
 #include "lib/singleton.hpp"


--- a/src/proc/common.hpp
+++ b/src/proc/common.hpp
@ -46,7 +46,7 @@
 #include "lib/util.hpp"
 #include "lib/lumitime.hpp"
 #include "include/symbol.hpp"
-#include "include/error.hpp"   ///< pulls in NoBug via nobugcfg.h
+#include "lib/error.hpp"   ///< pulls in NoBug via nobugcfg.h


 /**
--- a/src/proc/engine/buffhandle.hpp
+++ b/src/proc/engine/buffhandle.hpp
@ -39,7 +39,7 @@
 #define ENGINE_BUFFHANDLE_H


-#include "include/error.hpp"
+#include "lib/error.hpp"
 #include "lib/streamtype.hpp"


--- a/src/proc/engine/bufftable.hpp
+++ b/src/proc/engine/bufftable.hpp
@ -25,7 +25,7 @@
 #define ENGINE_BUFFHTABLE_H


-#include "include/error.hpp"
+#include "lib/error.hpp"
 #include "proc/engine/buffhandle.hpp"
 #include "proc/engine/procnode.hpp"

--- a/src/proc/mobject/session/defsmanager.cpp
+++ b/src/proc/mobject/session/defsmanager.cpp
@ -24,7 +24,7 @@
 #include "proc/mobject/session/defsmanager.hpp"
 #include "proc/mobject/session/defsregistry.hpp"
 #include "common/configrules.hpp"
-#include "include/error.hpp"
+#include "lib/error.hpp"

 #include <boost/format.hpp>

--- a/src/proc/mobject/session/sessionimpl.cpp
+++ b/src/proc/mobject/session/sessionimpl.cpp
@ -23,7 +23,7 @@

 #include "proc/mobject/session/sessionimpl.hpp"
 #include "proc/mobject/placement.hpp"
-#include "include/error.hpp"
+#include "lib/error.hpp"

 namespace mobject
  {
--- a/src/proc/mobject/session/sessmanagerimpl.cpp
+++ b/src/proc/mobject/session/sessmanagerimpl.cpp
@ -40,7 +40,7 @@
 #include "proc/mobject/session/sessionimpl.hpp"
 #include "proc/mobject/session/defsmanager.hpp"
 //#include "proc/mobject/session/defsregistry.hpp"
-#include "include/error.hpp"
+#include "lib/error.hpp"

 using boost::scoped_ptr;

--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@ -20,7 +20,7 @@ tests_srcdir = $(top_srcdir)/tests


 check_PROGRAMS += test-error
-test_error_SOURCES = $(tests_srcdir)/error/errortest.c
+test_error_SOURCES = $(tests_srcdir)/library/test-error.c
 test_error_CPPFLAGS = $(AM_CPPFLAGS) -std=gnu99 -Wall -Werror
 test_error_LDADD = liblumiera.la $(NOBUGMT_LUMIERA_LIBS)     liblumieracommon.la liblumieraproc.la -ldl -lboost_program_options-mt -lboost_regex-mt

--- a/tests/components/Makefile.am
+++ b/tests/components/Makefile.am
@ -47,7 +47,7 @@ test_components_SOURCES =							\
 	$(testcomponents_srcdir)/proc/asset/makecliptest.cpp			\
 	$(testcomponents_srcdir)/proc/asset/orderingofassetstest.cpp		\
 	$(testcomponents_srcdir)/proc/asset/testasset.cpp			\
-	$(testcomponents_srcdir)/proc/engine/bufftabletest.cpp         	\
+	$(testcomponents_srcdir)/proc/engine/bufftabletest.cpp			\
 	$(testcomponents_srcdir)/proc/engine/sourcenodetest.cpp         	\
 	$(testcomponents_srcdir)/proc/mobject/builder/buildertooltest.cpp	\
 	$(testcomponents_srcdir)/proc/mobject/builder/buildsegmenttest.cpp	\
--- a/tests/components/proc/engine/bufftabletest.cpp
+++ b/tests/components/proc/engine/bufftabletest.cpp
@ -22,7 +22,7 @@


 #include "lib/test/run.hpp"
-#include "include/error.hpp"
+#include "lib/error.hpp"

 #include "proc/engine/procnode.hpp"
 #include "proc/engine/bufftable.hpp"
--- a/tests/components/proc/mobject/session/testsession1.hpp
+++ b/tests/components/proc/mobject/session/testsession1.hpp
@ -26,7 +26,7 @@


 #include "proc/mobject/session.hpp"
-#include "include/error.hpp"
+#include "lib/error.hpp"
 //#include "lib/factory.hpp"
 //#include "lib/util.hpp"

--- a/tests/error/DIR_INFO
+++ b/tests/error/DIR_INFO
@ -1,3 +0,0 @@
-example (test) code for errorhandling
-The test application to be built from this directory shows how
-to use the various error handling features.
--- a/tests/lib/exceptionerrortest.cpp
+++ b/tests/lib/exceptionerrortest.cpp
@ -23,7 +23,7 @@


 #include "lib/error.h"
-#include "include/error.hpp"
+#include "lib/error.hpp"

 #include "lib/test/run.hpp"
 #include "lib/util.hpp"
--- a/tests/library/test-error.c
+++ b/tests/library/test-error.c
@ -1,5 +1,5 @@
 /*
-  errortest.c  -  test error handling
+  test-error.c  -  test error handling

  Copyright (C)         Lumiera.org
    2008,               Christian Thaeter <ct@pipapo.org>