geode-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From echobr...@apache.org
Subject geode-native git commit: GEODE-3168: Fixes CLI tests in Release mode
Date Mon, 17 Jul 2017 20:13:29 GMT
Repository: geode-native
Updated Branches:
  refs/heads/develop fafa7e0b6 -> 351fa598c


GEODE-3168: Fixes CLI tests in Release mode

- Disabled all optimization for static lib


Project: http://git-wip-us.apache.org/repos/asf/geode-native/repo
Commit: http://git-wip-us.apache.org/repos/asf/geode-native/commit/351fa598
Tree: http://git-wip-us.apache.org/repos/asf/geode-native/tree/351fa598
Diff: http://git-wip-us.apache.org/repos/asf/geode-native/diff/351fa598

Branch: refs/heads/develop
Commit: 351fa598c15bd6ed9942e3fdcb27d5fda8810faa
Parents: fafa7e0
Author: Jacob Barrett <jbarrett@pivotal.io>
Authored: Mon Jul 17 18:09:48 2017 +0000
Committer: Jacob Barrett <jbarrett@pivotal.io>
Committed: Mon Jul 17 18:30:09 2017 +0000

----------------------------------------------------------------------
 src/clicache/src/RegionFactory.hpp                    | 9 +--------
 src/clicache/src/impl/ManagedResultCollector.hpp      | 5 -----
 src/clicache/src/impl/PdxManagedCacheableKeyBytes.hpp | 4 +---
 src/cppcache/src/CMakeLists.txt                       | 2 ++
 4 files changed, 4 insertions(+), 16 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/geode-native/blob/351fa598/src/clicache/src/RegionFactory.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/RegionFactory.hpp b/src/clicache/src/RegionFactory.hpp
index af79747..6e781db 100644
--- a/src/clicache/src/RegionFactory.hpp
+++ b/src/clicache/src/RegionFactory.hpp
@@ -20,25 +20,18 @@
 #include "geode_defs.hpp"
 #include "begin_native.hpp"
 #include <geode/AttributesFactory.hpp>
+#include <geode/RegionFactory.hpp>
 #include "end_native.hpp"
 
-
 #include "ExpirationAction.hpp"
 #include "DiskPolicyType.hpp"
-//#include "ScopeType.hpp"
-#include "begin_native.hpp"
-#include <geode/RegionFactory.hpp>
-#include "end_native.hpp"
-
 #include "RegionShortcut.hpp"
-
 #include "ICacheLoader.hpp"
 #include "ICacheWriter.hpp"
 #include "ICacheListener.hpp"
 #include "IPartitionResolver.hpp"
 #include "IFixedPartitionResolver.hpp"
 #include "IPersistenceManager.hpp"
-
 #include "IRegion.hpp"
 #include "Properties.hpp"
 #include "Region.hpp"

http://git-wip-us.apache.org/repos/asf/geode-native/blob/351fa598/src/clicache/src/impl/ManagedResultCollector.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/impl/ManagedResultCollector.hpp b/src/clicache/src/impl/ManagedResultCollector.hpp
index a4eb34d..3dd419e 100644
--- a/src/clicache/src/impl/ManagedResultCollector.hpp
+++ b/src/clicache/src/impl/ManagedResultCollector.hpp
@@ -22,13 +22,8 @@
 #include <geode/ResultCollector.hpp>
 #include "end_native.hpp"
 
-//#include "../ResultCollector.hpp"
-//#include "../IResultCollector.hpp"
-//#include "../../../IResultCollector.hpp"
 #include "ResultCollectorProxy.hpp"
 #include "SafeConvert.hpp"
-//#include "SafeConvert.hpp"
-//using namespace apache::geode::client;
 
 //using namespace apache::geode::client;
 namespace apache {

http://git-wip-us.apache.org/repos/asf/geode-native/blob/351fa598/src/clicache/src/impl/PdxManagedCacheableKeyBytes.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/impl/PdxManagedCacheableKeyBytes.hpp b/src/clicache/src/impl/PdxManagedCacheableKeyBytes.hpp
index f9c1c9f..d388200 100644
--- a/src/clicache/src/impl/PdxManagedCacheableKeyBytes.hpp
+++ b/src/clicache/src/impl/PdxManagedCacheableKeyBytes.hpp
@@ -21,14 +21,12 @@
 #include <vcclr.h>
 #include "begin_native.hpp"
 #include <geode/CacheableKey.hpp>
+#include <geode/Delta.hpp>
 #include "end_native.hpp"
 
 #include "../Log.hpp"
 #include "../DataOutput.hpp"
 #include "PdxHelper.hpp"
-#include "begin_native.hpp"
-#include <geode/Delta.hpp>
-#include "end_native.hpp"
 
 
 using namespace System;

http://git-wip-us.apache.org/repos/asf/geode-native/blob/351fa598/src/cppcache/src/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/src/cppcache/src/CMakeLists.txt b/src/cppcache/src/CMakeLists.txt
index 07c6ad9..d8ff240 100644
--- a/src/cppcache/src/CMakeLists.txt
+++ b/src/cppcache/src/CMakeLists.txt
@@ -126,6 +126,8 @@ target_link_libraries(apache-geode-static
   PUBLIC
     _apache-geode
 )
+# Remove this after fixing static initialization
+target_compile_options(apache-geode-static PRIVATE "/Od /Ob0")
 add_dependencies(client-libraries apache-geode-static)
 
 install(TARGETS apache-geode


Mime
View raw message