celix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pnol...@apache.org
Subject celix git commit: CELIX-446: Adds a missing includes statement
Date Fri, 04 May 2018 12:45:53 GMT
Repository: celix
Updated Branches:
  refs/heads/develop 668ae88fa -> 031fb7399


CELIX-446: Adds a missing includes statement


Project: http://git-wip-us.apache.org/repos/asf/celix/repo
Commit: http://git-wip-us.apache.org/repos/asf/celix/commit/031fb739
Tree: http://git-wip-us.apache.org/repos/asf/celix/tree/031fb739
Diff: http://git-wip-us.apache.org/repos/asf/celix/diff/031fb739

Branch: refs/heads/develop
Commit: 031fb7399693710ec2a9e711521e2cdaa30cd3d5
Parents: 668ae88
Author: Pepijn Noltes <pepijnnoltes@gmail.com>
Authored: Fri May 4 14:45:36 2018 +0200
Committer: Pepijn Noltes <pepijnnoltes@gmail.com>
Committed: Fri May 4 14:45:36 2018 +0200

----------------------------------------------------------------------
 framework/tst/bundle_context_services_test.cpp | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/celix/blob/031fb739/framework/tst/bundle_context_services_test.cpp
----------------------------------------------------------------------
diff --git a/framework/tst/bundle_context_services_test.cpp b/framework/tst/bundle_context_services_test.cpp
index 69bae0b..89d2bee 100644
--- a/framework/tst/bundle_context_services_test.cpp
+++ b/framework/tst/bundle_context_services_test.cpp
@@ -25,8 +25,9 @@
 #include <CppUTest/TestHarness.h>
 #include <CppUTest/CommandLineTestRunner.h>
 #include <zconf.h>
-#include <constants.h>
+#include <string.h>
 
+#include "constants.h"
 #include "bundle.h"
 #include "properties.h"
 #include "celix_framework_factory.h"
@@ -477,7 +478,7 @@ TEST(CelixBundleContextServicesTests, serviceTrackerWithRaceConditionTest)
{
         lock.unlock();
     };
 
-    long trackerId = trackerId = celix_bundleContext_trackServices(ctx, calcName, NULL, NULL,
&data, add, remove);
+    long trackerId = celix_bundleContext_trackServices(ctx, calcName, NULL, NULL, &data,
add, remove);
 
     std::thread registerThread{[&]{
         long id = celix_bundleContext_registerService(ctx, calcName, &svc, NULL, NULL);
@@ -586,4 +587,4 @@ TEST(CelixBundleContextServicesTests, servicesTrackerSetTest) {
     CHECK_EQUAL(3, count); //check if the set is called the expected times
 }
 
-//TODO test tracker with options for properties & service owners
\ No newline at end of file
+//TODO test tracker with options for properties & service owners


Mime
View raw message