commit 7f02c1e1ec871e316ae289d57d6df6453005f00c
author Junxiao Shi <git@mail1.yoursunny.com> Wed Jan 29 22:57:01 2014 -0700
committer Alexander Afanasyev <alexander.afanasyev@ucla.edu> Wed Jan 29 22:23:20 2014 -0800
tree e02400df22832b4047bbc47ced8ef68eb8dd7909
parent 5b433984c181c8cfa8db5a81a14eb35a66940825

core: move event-emitter to core

Change-Id: I76f6fc7d8c4731bbbb95ea257e339e15b96dbea1

daemon/core/event-emitter.hpp

diff --git a/daemon/util/event-emitter.hpp b/daemon/core/event-emitter.hpp
similarity index 97%
rename from daemon/util/event-emitter.hpp
rename to daemon/core/event-emitter.hpp
index 0e30970..b735c20 100644
--- a/daemon/util/event-emitter.hpp
+++ b/daemon/core/event-emitter.hpp
@@ -4,8 +4,8 @@
  * See COPYING for copyright and distribution information.
  */
 
-#ifndef NFD_UTIL_EVENT_EMITTER_HPP
-#define NFD_UTIL_EVENT_EMITTER_HPP
+#ifndef NFD_CORE_EVENT_EMITTER_HPP
+#define NFD_CORE_EVENT_EMITTER_HPP
 
 #include "common.hpp"
 
@@ -322,4 +322,4 @@
 
 } // namespace nfd
 
-#endif // NFD_UTIL_EVENT_EMITTER_HPP
+#endif // NFD_CORE_EVENT_EMITTER_HPP

daemon/face/face.hpp

diff --git a/daemon/face/face.hpp b/daemon/face/face.hpp
index d6da710..9ff2d20 100644
--- a/daemon/face/face.hpp
+++ b/daemon/face/face.hpp
@@ -8,7 +8,7 @@
 #define NFD_FACE_FACE_H
 
 #include "common.hpp"
-#include "util/event-emitter.hpp"
+#include "core/event-emitter.hpp"
 
 namespace nfd {
 

tests/core/event-emitter.cpp

diff --git a/tests/util/event-emitter.cpp b/tests/core/event-emitter.cpp
similarity index 98%
rename from tests/util/event-emitter.cpp
rename to tests/core/event-emitter.cpp
index 5f8d947..c44b6d2 100644
--- a/tests/util/event-emitter.cpp
+++ b/tests/core/event-emitter.cpp
@@ -4,9 +4,9 @@
  * See COPYING for copyright and distribution information.
  */
 
-#include <boost/test/unit_test.hpp>
+#include "core/event-emitter.hpp"
 
-#include "util/event-emitter.hpp"
+#include <boost/test/unit_test.hpp>
 
 namespace nfd {